From e308b2a2d79ba2a690715c457bf2730bcc3f16f6 Mon Sep 17 00:00:00 2001 From: Jacob C <44846403+chusloj@users.noreply.github.com> Date: Mon, 5 Apr 2021 15:23:38 -0400 Subject: [PATCH 1/5] remove 3.6 from testing --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index d5df3ddf5..8a30bf392 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,4 +1,4 @@ -name: Build Package and Test Source Code [Python 3.6, 3.7, 3.8, 3.9] +name: Build Package and Test Source Code [Python 3.7, 3.8, 3.9] on: [push, pull_request] @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] steps: - name: Checkout From 801f05a440cee98fa42fcc409e992f9441dbf641 Mon Sep 17 00:00:00 2001 From: Jacob C <44846403+chusloj@users.noreply.github.com> Date: Tue, 6 Apr 2021 10:19:49 -0400 Subject: [PATCH 2/5] add back codecov --- .github/workflows/build_and_test.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 8a30bf392..c8596a7ce 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -35,12 +35,12 @@ jobs: working-directory: ./ run: | pytest -m 'not requires_pufcsv and not pre_release and not local' --cov=./ --cov-report=xml - # - name: Upload coverage to Codecov - # uses: codecov/codecov-action@v1 - # with: - # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos - # file: ./coverage.xml - # flags: unittests - # name: codecov-umbrella - # fail_ci_if_error: true - # verbose: true \ No newline at end of file + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos + file: ./coverage.xml + flags: unittests + name: codecov-umbrella + fail_ci_if_error: true + verbose: true \ No newline at end of file From c0599c06bd6beb0f422e3178ffd86fe40a8d90e5 Mon Sep 17 00:00:00 2001 From: Jacob C <44846403+chusloj@users.noreply.github.com> Date: Tue, 6 Apr 2021 13:37:34 -0400 Subject: [PATCH 3/5] temp pin fsspec --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index ede951f5a..cff303aa4 100644 --- a/environment.yml +++ b/environment.yml @@ -9,6 +9,7 @@ dependencies: - requests - aiohttp - numba +- "fsspec<=0.8.7" - pytest - pytest-pep8 - pytest-xdist From e565b8f0942537106faaa3e6e2e5eeb8b8a2ea97 Mon Sep 17 00:00:00 2001 From: Jacob C <44846403+chusloj@users.noreply.github.com> Date: Tue, 6 Apr 2021 13:55:32 -0400 Subject: [PATCH 4/5] add missing dep to tests --- taxcalc/tests/test_4package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/taxcalc/tests/test_4package.py b/taxcalc/tests/test_4package.py index b9d575a42..cb35c6004 100644 --- a/taxcalc/tests/test_4package.py +++ b/taxcalc/tests/test_4package.py @@ -31,6 +31,7 @@ def test_for_consistency(tests_path): and conda.recipe/meta.yaml requirements. """ dev_pkgs = set([ + 'fsspec<=0.8.7' 'pytest', 'pytest-pep8', 'pytest-xdist', From 46dcd32a61c3b6c037a34905b0c4e5d13ec25eda Mon Sep 17 00:00:00 2001 From: Jacob C <44846403+chusloj@users.noreply.github.com> Date: Tue, 6 Apr 2021 14:16:16 -0400 Subject: [PATCH 5/5] missed a comma --- taxcalc/tests/test_4package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taxcalc/tests/test_4package.py b/taxcalc/tests/test_4package.py index cb35c6004..431e36acc 100644 --- a/taxcalc/tests/test_4package.py +++ b/taxcalc/tests/test_4package.py @@ -31,7 +31,7 @@ def test_for_consistency(tests_path): and conda.recipe/meta.yaml requirements. """ dev_pkgs = set([ - 'fsspec<=0.8.7' + 'fsspec<=0.8.7', 'pytest', 'pytest-pep8', 'pytest-xdist',