From d275a99215744a0b8215800e42e1b307ba914758 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 4 Jan 2021 10:12:15 -0500 Subject: [PATCH 01/16] pin to pandas >-1.2.0 --- conda.recipe/meta.yaml | 4 ++-- environment.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 914f6fa11..ce999cac3 100755 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -10,7 +10,7 @@ requirements: build: - python - "numpy>=1.14" - - "pandas>=1.1.0" + - "pandas>=1.2.0" - "bokeh>=1.4.0" - requests - numba @@ -19,7 +19,7 @@ requirements: run: - python - "numpy>=1.14" - - "pandas>=1.1.0" + - "pandas>=1.2.0" - "bokeh>=1.4.0" - requests - numba diff --git a/environment.yml b/environment.yml index f18c31a5a..eb2833bef 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: dependencies: - python - "numpy>=1.14" -- "pandas>=1.1.0" +- "pandas>=1.2.0" - "bokeh>=1.4.0" - requests - numba From 4582583ce3616c3e5d436a4f1bd4cbf8d57d0914 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 4 Jan 2021 10:12:37 -0500 Subject: [PATCH 02/16] update expected output for new, more precise pandas --- taxcalc/tests/cpscsv_agg_expect.csv | 52 ++++++++++++++--------------- taxcalc/tests/pufcsv_agg_expect.csv | 52 ++++++++++++++--------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/taxcalc/tests/cpscsv_agg_expect.csv b/taxcalc/tests/cpscsv_agg_expect.csv index fb0d9f45c..0e5d30a97 100644 --- a/taxcalc/tests/cpscsv_agg_expect.csv +++ b/taxcalc/tests/cpscsv_agg_expect.csv @@ -1,26 +1,26 @@ -,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026 -Returns (#m),197.0,199.9,202.7,205.4,208.1,210.8,213.5,216.2,219.0,221.7 -AGI ($b),10549.1,11168.4,11713.7,11475.6,11691.4,12219.5,12722.8,13288.9,13916.9,14582.0 -Itemizers (#m),67.8,28.8,30.5,31.4,29.2,30.7,32.1,33.4,35.0,81.6 -Itemized Deduction ($b),1339.1,734.2,791.0,832.9,760.4,809.8,863.4,919.3,986.0,1956.9 -Standard Deduction Filers (#m),129.2,171.1,172.3,174.0,179.0,180.2,181.4,182.8,184.0,140.1 -Standard Deduction ($b),1224.7,3016.4,3089.9,3170.7,3289.5,3344.9,3425.0,3520.0,3615.8,1559.7 -Personal Exemption ($b),1482.3,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1907.3 -Taxable Income ($b),7471.9,8388.7,8836.0,8531.4,8731.1,9177.5,9580.0,10032.6,10538.5,10457.6 -Regular Tax ($b),1482.0,1496.5,1581.8,1507.6,1544.5,1635.6,1715.0,1803.9,1904.2,2121.2 -AMT Income ($b),9689.3,10621.1,11121.6,10849.7,11122.1,11611.6,12072.5,12593.9,13168.6,13306.6 -AMT Liability ($b),10.8,0.8,1.0,0.9,0.9,0.9,0.9,0.9,0.9,15.0 -AMT Filers (#m),3.4,0.2,0.4,0.4,0.4,0.4,0.4,0.4,0.4,4.3 -Tax before Credits ($b),1492.9,1497.2,1582.7,1508.5,1545.4,1636.5,1715.9,1804.8,1905.1,2136.2 -Refundable Credits ($b),82.1,96.6,96.7,103.3,103.0,102.3,102.1,102.1,102.7,87.5 -Nonrefundable Credits ($b),33.2,95.6,97.4,95.3,96.9,98.9,100.6,102.2,103.8,31.1 -Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -Other Taxes ($b),12.4,13.6,14.3,13.9,12.3,13.1,13.7,14.7,16.0,17.3 -Ind Income Tax ($b),1390.0,1318.6,1402.9,1323.8,1357.9,1448.3,1526.9,1615.2,1714.7,2034.9 -Payroll Taxes ($b),1104.5,1156.3,1210.9,1186.7,1213.9,1267.1,1319.5,1375.5,1436.8,1502.7 -Combined Liability ($b),2494.5,2474.9,2613.8,2510.5,2571.8,2715.4,2846.5,2990.7,3151.5,3537.6 -With Income Tax <= 0 (#m),92.2,96.8,97.4,100.9,102.1,102.4,103.0,103.6,104.2,101.5 -With Combined Tax <= 0 (#m),63.7,66.3,67.2,69.3,70.8,71.6,72.6,73.5,74.4,73.6 -UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -"Total Benefits, Consumption Value ($b)",3061.5,3253.0,3458.2,3650.1,3871.6,4112.5,4372.9,4645.2,4929.2,5219.0 -Total Benefits Cost ($b),3061.5,3253.0,3458.2,3650.1,3871.6,4112.5,4372.9,4645.2,4929.2,5219.0 +,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026 +Returns (#m),197,199.9,202.7,205.4,208.1,210.8,213.5,216.2,219,221.7 +AGI ($b),10549.1,11168.4,11713.7,11475.6,11691.4,12219.5,12722.8,13288.9,13916.9,14582 +Itemizers (#m),67.8,28.8,30.5,31.4,29.2,30.7,32.1,33.4,35,81.6 +Itemized Deduction ($b),1339.1,734.2,791,832.9,760.4,809.8,863.4,919.3,986,1956.9 +Standard Deduction Filers (#m),129.2,171.1,172.3,174,179,180.1,181.5,182.8,184,140.1 +Standard Deduction ($b),1224.7,3016.4,3089.9,3170.7,3289.5,3344.9,3425.1,3520,3615.8,1559.6 +Personal Exemption ($b),1482.3,0,0,0,0,0,0,0,0,1907.3 +Taxable Income ($b),7471.9,8388.7,8836,8531.4,8731.1,9177.5,9580,10032.6,10538.5,10457.6 +Regular Tax ($b),1482,1496.5,1581.8,1507.6,1544.5,1635.6,1715,1803.9,1904.2,2121.2 +AMT Income ($b),9689.3,10621.1,11121.6,10849.7,11122.1,11611.6,12072.5,12593.9,13168.6,13306.6 +AMT Liability ($b),10.8,0.8,1,0.9,0.9,0.9,0.9,0.9,0.9,15 +AMT Filers (#m),3.4,0.2,0.4,0.4,0.4,0.4,0.4,0.4,0.4,4.3 +Tax before Credits ($b),1492.9,1497.2,1582.7,1508.5,1545.4,1636.5,1715.9,1804.8,1905.1,2136.2 +Refundable Credits ($b),82.1,96.6,96.7,103.3,103,102.3,102.1,102.1,102.7,87.5 +Nonrefundable Credits ($b),33.2,95.6,97.4,95.3,96.9,98.9,100.6,102.2,103.8,31.1 +Reform Surtaxes ($b),0,0,0,0,0,0,0,0,0,0 +Other Taxes ($b),12.4,13.6,14.3,13.9,12.3,13.1,13.7,14.7,16,17.3 +Ind Income Tax ($b),1390,1318.6,1402.9,1323.8,1357.9,1448.3,1526.9,1615.2,1714.7,2034.9 +Payroll Taxes ($b),1104.5,1156.3,1210.9,1186.7,1213.9,1267.1,1319.5,1375.5,1436.8,1502.7 +Combined Liability ($b),2494.5,2474.9,2613.8,2510.5,2571.8,2715.4,2846.5,2990.7,3151.5,3537.6 +With Income Tax <= 0 (#m),92.2,96.8,97.4,100.9,102.1,102.4,103,103.6,104.2,101.5 +With Combined Tax <= 0 (#m),63.7,66.3,67.2,69.3,70.8,71.6,72.6,73.5,74.4,73.6 +UBI Benefits ($b),0,0,0,0,0,0,0,0,0,0 +"Total Benefits, Consumption Value ($b)",3061.5,3253,3458.2,3650.1,3871.6,4112.5,4372.9,4645.2,4929.2,5219 +Total Benefits Cost ($b),3061.5,3253,3458.2,3650.1,3871.6,4112.5,4372.9,4645.2,4929.2,5219 \ No newline at end of file diff --git a/taxcalc/tests/pufcsv_agg_expect.csv b/taxcalc/tests/pufcsv_agg_expect.csv index 4813d0d82..36bd9ed42 100644 --- a/taxcalc/tests/pufcsv_agg_expect.csv +++ b/taxcalc/tests/pufcsv_agg_expect.csv @@ -1,26 +1,26 @@ -,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026 -Returns (#m),169.9,172.7,175.2,177.5,179.8,182.0,184.3,186.4,188.7,190.9 -AGI ($b),11313.0,12036.9,12586.7,12320.7,12552.8,13103.6,13627.7,14227.7,14889.8,15505.7 -Itemizers (#m),46.2,20.8,21.8,22.4,20.8,21.5,22.1,22.7,23.4,53.8 -Itemized Deduction ($b),1306.5,653.5,691.3,724.1,667.2,698.8,734.3,770.6,812.9,1840.3 -Standard Deduction Filers (#m),123.7,152.0,153.4,155.1,158.9,160.5,162.1,163.7,165.3,137.1 -Standard Deduction ($b),1096.2,2579.0,2651.8,2720.4,2815.1,2870.3,2946.5,3033.3,3126.1,1421.2 -Personal Exemption ($b),1253.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1576.8 -Taxable Income ($b),8228.7,9296.8,9761.6,9427.5,9640.2,10111.8,10535.8,11026.7,11572.4,11421.0 -Regular Tax ($b),1680.2,1733.6,1822.4,1736.4,1782.7,1883.0,1969.1,2070.0,2182.3,2375.7 -AMT Income ($b),10708.6,11605.2,12127.5,11837.3,12110.6,12638.0,13135.8,13708.2,14338.2,14645.5 -AMT Liability ($b),50.1,23.0,24.2,25.2,24.5,25.2,26.3,27.5,28.9,71.4 -AMT Filers (#m),5.4,0.5,1.2,1.2,1.2,1.2,1.2,1.2,1.2,7.2 -Tax before Credits ($b),1730.3,1756.6,1846.6,1761.6,1807.2,1908.2,1995.5,2097.4,2211.2,2447.1 -Refundable Credits ($b),104.6,120.0,121.0,127.1,126.0,126.3,127.0,128.1,130.1,114.5 -Nonrefundable Credits ($b),67.4,126.7,128.2,125.5,126.8,130.3,133.2,136.6,139.6,76.3 -Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -Other Taxes ($b),42.1,47.5,50.4,49.2,47.6,48.3,48.8,49.9,51.7,52.3 -Ind Income Tax ($b),1600.3,1557.4,1647.8,1558.2,1602.0,1699.9,1784.1,1882.7,1993.1,2308.5 -Payroll Taxes ($b),1110.4,1160.6,1214.4,1191.6,1217.1,1269.9,1322.4,1378.3,1439.2,1504.9 -Combined Liability ($b),2710.8,2718.0,2862.2,2749.9,2819.2,2969.8,3106.5,3261.0,3432.3,3813.4 -With Income Tax <= 0 (#m),69.2,75.4,75.4,78.5,79.2,79.1,79.2,79.5,79.7,74.1 -With Combined Tax <= 0 (#m),40.4,42.1,42.7,44.3,45.2,45.5,45.9,46.6,47.0,45.6 -UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -"Total Benefits, Consumption Value ($b)",907.9,950.8,1007.9,1066.2,1132.5,1206.8,1288.9,1371.9,1457.6,1546.8 -Total Benefits Cost ($b),907.9,950.8,1007.9,1066.2,1132.5,1206.8,1288.9,1371.9,1457.6,1546.8 +,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026 +Returns (#m),169.9,172.7,175.2,177.5,179.8,182,184.3,186.4,188.7,190.9 +AGI ($b),11313,12036.9,12586.7,12320.7,12552.8,13103.6,13627.7,14227.7,14889.8,15505.7 +Itemizers (#m),46.2,20.8,21.8,22.4,20.8,21.5,22.1,22.7,23.4,53.8 +Itemized Deduction ($b),1306.5,653.5,691.3,724.1,667.2,698.9,734.3,770.6,812.9,1840.4 +Standard Deduction Filers (#m),123.7,152,153.4,155.1,159,160.5,162.1,163.7,165.3,137.1 +Standard Deduction ($b),1096.2,2579,2651.8,2720.4,2815.1,2870.3,2946.5,3033.3,3126.1,1421.2 +Personal Exemption ($b),1253,0,0,0,0,0,0,0,0,1576.8 +Taxable Income ($b),8228.7,9296.8,9761.6,9427.5,9640.2,10111.8,10535.8,11026.7,11572.4,11421 +Regular Tax ($b),1680.2,1733.6,1822.4,1736.4,1782.7,1883,1969.1,2070,2182.3,2375.7 +AMT Income ($b),10708.6,11605.2,12127.5,11837.3,12110.6,12637.9,13135.8,13708.2,14338.2,14645.5 +AMT Liability ($b),50.1,23,24.2,25.2,24.5,25.2,26.3,27.5,28.9,71.4 +AMT Filers (#m),5.4,0.5,1.2,1.2,1.2,1.2,1.2,1.2,1.2,7.2 +Tax before Credits ($b),1730.3,1756.6,1846.6,1761.6,1807.2,1908.2,1995.5,2097.4,2211.2,2447.1 +Refundable Credits ($b),104.6,120,121,127.1,126,126.3,127,128.1,130.1,114.5 +Nonrefundable Credits ($b),67.4,126.7,128.2,125.5,126.8,130.3,133.2,136.6,139.6,76.3 +Reform Surtaxes ($b),0,0,0,0,0,0,0,0,0,0 +Other Taxes ($b),42.1,47.5,50.4,49.2,47.6,48.3,48.8,49.9,51.7,52.3 +Ind Income Tax ($b),1600.3,1557.4,1647.8,1558.2,1602,1699.9,1784.1,1882.7,1993.1,2308.5 +Payroll Taxes ($b),1110.4,1160.6,1214.4,1191.6,1217.1,1269.9,1322.4,1378.3,1439.2,1504.9 +Combined Liability ($b),2710.8,2718,2862.2,2749.9,2819.2,2969.8,3106.5,3261,3432.3,3813.4 +With Income Tax <= 0 (#m),69.2,75.4,75.4,78.5,79.2,79.1,79.2,79.4,79.7,74.1 +With Combined Tax <= 0 (#m),40.4,42.1,42.7,44.3,45.2,45.5,45.9,46.6,47,45.6 +UBI Benefits ($b),0,0,0,0,0,0,0,0,0,0 +"Total Benefits, Consumption Value ($b)",907.9,950.8,1007.9,1066.2,1132.5,1206.8,1288.9,1371.9,1457.6,1546.8 +Total Benefits Cost ($b),907.9,950.8,1007.9,1066.2,1132.5,1206.8,1288.9,1371.9,1457.6,1546.8 \ No newline at end of file From f75d6b79fe3c2196a4eadb0d672d639c215f2cf7 Mon Sep 17 00:00:00 2001 From: hdoupe Date: Mon, 4 Jan 2021 12:09:49 -0500 Subject: [PATCH 03/16] Set state for all parameters to fix bug --- taxcalc/parameters.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/taxcalc/parameters.py b/taxcalc/parameters.py index b0408a164..fec5aa0b6 100644 --- a/taxcalc/parameters.py +++ b/taxcalc/parameters.py @@ -424,6 +424,7 @@ def adjust_with_indexing(self, params_or_path, **kwargs): # Re-instate ops. self.label_to_extend = label_to_extend self.array_first = array_first + self.set_state() # Filter out "-indexed" params. nonindexed_params = { @@ -432,10 +433,6 @@ def adjust_with_indexing(self, params_or_path, **kwargs): if param not in index_affected } - needs_reset = set(needs_reset) - set(nonindexed_params.keys()) - if needs_reset: - self._set_state(params=needs_reset) - # 3. Do adjustment for all non-indexing related parameters. adj = super().adjust(nonindexed_params, **kwargs) From df5180739fe66e33e828e8e72c4515038b0e915e Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 4 Jan 2021 17:32:03 -0500 Subject: [PATCH 04/16] add GH action to do unit tests and codecov --- .github/workflows/build_and_test.yml | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/build_and_test.yml diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml new file mode 100644 index 000000000..e831ef568 --- /dev/null +++ b/.github/workflows/build_and_test.yml @@ -0,0 +1,44 @@ +name: Build Package and Test Source Code [Python 3.6, 3.7, 3.8] + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.6, 3.7, 3.8] + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + persist-credentials: false + + - name: Setup Miniconda using Python ${{ matrix.python-version }} + uses: conda-incubator/setup-miniconda@v2 + with: + activate-environment: taxcalc-dev + environment-file: environment.yml + python-version: ${{ matrix.python-version }} + auto-activate-base: false + + - name: Build + shell: bash -l {0} + run: | + pip install -e . + pip install pytest-cov + pip install pytest-pycodestyle + - name: Test + shell: bash -l {0} + working-directory: ./ + run: | + pytest -m 'not requires_pufcsv and not pre_release and not local' --pycodestyle --cov=./ --cov-report=xml + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v1 + with: + file: ./coverage.xml + flags: unittests + name: codecov-umbrella + fail_ci_if_error: true + verbose: true \ No newline at end of file From 668b6f395d89b0eaf5dcd126bd618be6a0e5bf04 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 4 Jan 2021 18:05:02 -0500 Subject: [PATCH 05/16] try without pycodestyle tests --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index e831ef568..e6fc1dd31 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -33,7 +33,7 @@ jobs: shell: bash -l {0} working-directory: ./ run: | - pytest -m 'not requires_pufcsv and not pre_release and not local' --pycodestyle --cov=./ --cov-report=xml + 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: From 0ad39e11f88bf5f2769f6d89be91b868af578f16 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 4 Jan 2021 19:26:49 -0500 Subject: [PATCH 06/16] add codecov yaml file --- codecov.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 000000000..38c9a93de --- /dev/null +++ b/codecov.yml @@ -0,0 +1,24 @@ +codecov: + require_ci_to_pass: yes + +coverage: + precision: 2 + round: down + range: "70...100" + +parsers: + gcov: + branch_detection: + conditional: yes + loop: yes + method: no + macro: no + +comment: + layout: "reach, diff, flags, files" + behavior: default + require_changes: false + +ignore: + - "setup.py" + - "new_json.py" \ No newline at end of file From e41fb13a288674e790abdcfa19b9409694687873 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 5 Jan 2021 09:55:31 -0500 Subject: [PATCH 07/16] comment out codecov because issues uploading --- .github/workflows/build_and_test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index e6fc1dd31..a40932ed0 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -34,11 +34,11 @@ 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: - 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: + # file: ./coverage.xml + # flags: unittests + # name: codecov-umbrella + # fail_ci_if_error: true + # verbose: true \ No newline at end of file From b3a1f5a901086be6d0ca85722174cb633fdd5c48 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 5 Jan 2021 10:14:10 -0500 Subject: [PATCH 08/16] try again with pycodestyle tests --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index a40932ed0..b992bfc23 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -33,7 +33,7 @@ jobs: shell: bash -l {0} working-directory: ./ run: | - pytest -m 'not requires_pufcsv and not pre_release and not local' --cov=./ --cov-report=xml + pytest -m 'not requires_pufcsv and not pre_release and not local' --pycodestyle --cov=./ --cov-report=xml # - name: Upload coverage to Codecov # uses: codecov/codecov-action@v1 # with: From 52005b5cf0af69311717bb27ea22c27129b6c991 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 5 Jan 2021 12:15:40 -0500 Subject: [PATCH 09/16] remove pycodestyle test --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index b992bfc23..a40932ed0 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -33,7 +33,7 @@ jobs: shell: bash -l {0} working-directory: ./ run: | - pytest -m 'not requires_pufcsv and not pre_release and not local' --pycodestyle --cov=./ --cov-report=xml + 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: From 2236b48324686b7e45a970bcafe1b59e42872726 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Thu, 7 Jan 2021 10:06:30 -0500 Subject: [PATCH 10/16] uncomment codecov upload --- .github/workflows/build_and_test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index a40932ed0..e6fc1dd31 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -34,11 +34,11 @@ 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: - # 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: + file: ./coverage.xml + flags: unittests + name: codecov-umbrella + fail_ci_if_error: true + verbose: true \ No newline at end of file From bbcbbe9d045ebab21eb615028d07828362e23efc Mon Sep 17 00:00:00 2001 From: jdebacker Date: Thu, 7 Jan 2021 10:37:35 -0500 Subject: [PATCH 11/16] add token --- .github/workflows/build_and_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index e6fc1dd31..93544622b 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -38,6 +38,7 @@ jobs: uses: codecov/codecov-action@v1 with: file: ./coverage.xml + token: ${{ secrets.CODECOV_TOKEN }}} flags: unittests name: codecov-umbrella fail_ci_if_error: true From f2d9f684bd7d71727a4ade3270930a6c5a504e28 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Thu, 7 Jan 2021 11:15:57 -0500 Subject: [PATCH 12/16] update flow --- .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 93544622b..0df8e4794 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@master with: persist-credentials: false @@ -38,7 +38,7 @@ jobs: uses: codecov/codecov-action@v1 with: file: ./coverage.xml - token: ${{ secrets.CODECOV_TOKEN }}} + token: ${{ secrets.CODECOV_TOKEN }} flags: unittests name: codecov-umbrella fail_ci_if_error: true From ab33c1c77b1fe69cb94916b0dbe34a910f46d2a4 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Thu, 7 Jan 2021 13:10:07 -0500 Subject: [PATCH 13/16] nevermind on the codecov report upload --- .github/workflows/build_and_test.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 0df8e4794..a40932ed0 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v2 with: persist-credentials: false @@ -34,12 +34,11 @@ 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: - file: ./coverage.xml - token: ${{ secrets.CODECOV_TOKEN }} - 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: + # file: ./coverage.xml + # flags: unittests + # name: codecov-umbrella + # fail_ci_if_error: true + # verbose: true \ No newline at end of file From 7e622b5a1bd7879e637f63911f5fc24a19d44956 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Fri, 8 Jan 2021 08:59:35 -0500 Subject: [PATCH 14/16] try again with upload codecov --- .github/workflows/build_and_test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index a40932ed0..e6fc1dd31 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -34,11 +34,11 @@ 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: - # 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: + file: ./coverage.xml + flags: unittests + name: codecov-umbrella + fail_ci_if_error: true + verbose: true \ No newline at end of file From 73042c6fda2fc3112110159597b4480b2fff2510 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Fri, 8 Jan 2021 09:20:33 -0500 Subject: [PATCH 15/16] try again with upload codecov --- .github/workflows/build_and_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index e6fc1dd31..baed951d5 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@master with: persist-credentials: false @@ -37,6 +37,7 @@ jobs: - 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 From 86488e335ae51fb233905baa39d0d4be298183d9 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Fri, 8 Jan 2021 09:50:22 -0500 Subject: [PATCH 16/16] remove upload, still not working --- .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 baed951d5..9cafd4a0a 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -34,12 +34,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