From 74a5bd940c00e478623707a0b2e7a5026157dbc5 Mon Sep 17 00:00:00 2001
From: Luiz Irber <luiz.irber@gmail.com>
Date: Wed, 9 Dec 2020 12:22:26 -0800
Subject: [PATCH] run docs and package_description on py38

---
 .github/workflows/python.yml |  9 +++++----
 .github/workflows/rust.yml   |  2 +-
 tox.ini                      | 18 +++++++++++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index cb5cc89940..dfd5dc018b 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -74,7 +74,8 @@ jobs:
         env:
           PYTHONDEVMODE: 1
 
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
-        with:
-          fail_ci_if_error: true
+      - name: set coverage location
+        id: covloc
+        run: |
+          PYNAME=$(echo ${{ matrix.py }} | tr -d .)
+          echo "::set-output name=coverage_file::.tox/junit.py${PYNAME}.xml"
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index d6774535f5..ef1ce85e9a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -130,7 +130,7 @@ jobs:
       - name: Upload Rust coverage to codecov
         uses: codecov/codecov-action@v1
         with:
-          flags: rusttests
+          flags: rust
           fail_ci_if_error: true
 
   lints:
diff --git a/tox.ini b/tox.ini
index 41350fe91b..5d0546288d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 envlist =
   py39,
   coverage,
+  codecov,
   docs,
   package_description
   py38,
@@ -19,6 +20,7 @@ setenv =
     VIRTUALENV_NO_DOWNLOAD = 1
     PIP_EXTRA_INDEX_URL = https://antocuni.github.io/pypy-wheels/manylinux2010
 passenv =
+    TOXENV
     CURL_CA_BUNDLE
     http_proxy
     https_proxy
@@ -116,12 +118,18 @@ parallel_show_output = True
 [testenv:codecov]
 description = [only run on CI]: upload coverage data to codecov (depends on coverage running first)
 passenv = {[testenv]passenv}
-          CODECOV_TOKEN
+          CODECOV_*
+          GITHUB_ACTION
+          GITHUB_REF
+          GITHUB_HEAD_REF
+          GITHUB_RUN_ID
+          GITHUB_SHA
+          GITHUB_REPOSITORY
 deps = codecov
 skip_install = True
 changedir = {toxinidir}
 depends = coverage
-commands = codecov --file "{toxworkdir}/coverage.xml" {posargs}
+commands = codecov -e $TOXENV --file "{toxworkdir}/coverage.xml" -F python {posargs}
 
 [testenv:X]
 description = print the positional arguments passed in with echo
@@ -152,9 +160,9 @@ source = src/sourmash/
 
 [gh-actions]
 python =
-  3.7: py37, docs, package_description, coverage, codecov
-  3.8: py38, coverage, codecov
-  3.9: py39, coverage, codecov, fix_lint
+  3.7: py37, coverage, codecov
+  3.8: py38, docs, package_description, fix_lint, coverage, codecov
+  3.9: py39, coverage, codecov
 
 [flake8]
 max-complexity = 22