From e04f03fd949e3be53eec6f539281bcca883bf14c Mon Sep 17 00:00:00 2001 From: Brioch Date: Fri, 4 Dec 2020 08:57:34 +1300 Subject: [PATCH 01/28] Coveralls test --- .github/workflows/ci.yml | 102 ++++++--------------------------------- 1 file changed, 14 insertions(+), 88 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 811cf92f7..74c6cbd56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,95 +154,21 @@ jobs: --with-coverage --cover-package=pyemu --cover-xml \ --cover-xml-file=../coverage.xml -w ./autotest ${{ matrix.test-path }} + - name: Coveralls Parallel + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.github_token }} + flag-name: run-${{ matrix.test-path }} + parallel: true - # - name: "pst tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest pst_tests.py - - # - name: "utils tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest utils_tests.py - - # - name: "mat tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest mat_tests.py - - # - name: "en tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest en_tests.py - - # - name: "la tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest la_tests.py - - # - name: "PstFrom tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest pst_from_tests.py - - # - name: "da tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest da_tests.py - - # - name: "moouu tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest moouu_tests.py - - # - name: "full meal deal tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest full_meal_deal_tests.py - - # - name: "plot tests" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest plot_tests.py - - # - name: "pst tests 2" - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest pst_tests_2.py - - # - name: "notebook tests" - # if: ${{ runner.os == 'Linux' && matrix.python-version == '3.8' }} - # shell: bash -l {0} - # run: | - # nosetests -v --with-id --nocapture --with-timer \ - # --with-coverage --cover-package=pyemu --cover-xml \ - # --cover-xml-file=../coverage.xml -w ./autotest autotest_notebooks.py - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1.0.15 + finish: + needs: test + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: coverallsapp/github-action@master with: - file: ./coverage.xml + github-token: ${{ secrets.github_token }} + parallel-finished: true From 7376b355b198ebb6ad1bc37015db78bd62b5853b Mon Sep 17 00:00:00 2001 From: Brioch Date: Fri, 4 Dec 2020 09:35:12 +1300 Subject: [PATCH 02/28] more coverage --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74c6cbd56..1a92eac33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,8 +151,7 @@ jobs: shell: bash -l {0} run: | nosetests -v --with-id --nocapture --with-timer \ - --with-coverage --cover-package=pyemu --cover-xml \ - --cover-xml-file=../coverage.xml -w ./autotest ${{ matrix.test-path }} + --with-coverage --cover-package=pyemu -w ./autotest ${{ matrix.test-path }} - name: Coveralls Parallel uses: coverallsapp/github-action@master @@ -162,7 +161,7 @@ jobs: parallel: true finish: - needs: test + needs: pyemuCI runs-on: ubuntu-latest steps: - name: Coveralls Finished From 2f3ef093507b8360daf242b06c101870d69b6099 Mon Sep 17 00:00:00 2001 From: Brioch Date: Fri, 4 Dec 2020 17:15:07 +1300 Subject: [PATCH 03/28] more coveralls tests --- .github/workflows/ci.yml | 30 +++++++++++++++++------------- etc/environment.yml | 1 + 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a92eac33..660d49221 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,21 +153,25 @@ jobs: nosetests -v --with-id --nocapture --with-timer \ --with-coverage --cover-package=pyemu -w ./autotest ${{ matrix.test-path }} - - name: Coveralls Parallel - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.github_token }} - flag-name: run-${{ matrix.test-path }} - parallel: true + - name: Upload Coveralls + run: coveralls + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_FLAG_NAME: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} + COVERALLS_PARALLEL: true - finish: + coveralls: + name: Finish Coveralls needs: pyemuCI runs-on: ubuntu-latest - steps: - - name: Coveralls Finished - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.github_token }} - parallel-finished: true + container: python:3-slim + steps: + - name: Finished + run: | + pip3 install --upgrade coveralls + coveralls --finish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + diff --git a/etc/environment.yml b/etc/environment.yml index 25e6b35be..9384c9141 100644 --- a/etc/environment.yml +++ b/etc/environment.yml @@ -9,3 +9,4 @@ dependencies: - nbsphinx - matplotlib - coverage + - coveralls From 19ae48dfff7bb96acba64f4991bc5c940307e2a4 Mon Sep 17 00:00:00 2001 From: Brioch Date: Fri, 4 Dec 2020 20:31:33 +1300 Subject: [PATCH 04/28] Using alt coveralls hook --- .github/workflows/ci.yml | 54 ++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 660d49221..d7b6442b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,25 +153,41 @@ jobs: nosetests -v --with-id --nocapture --with-timer \ --with-coverage --cover-package=pyemu -w ./autotest ${{ matrix.test-path }} - - name: Upload Coveralls - run: coveralls - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_FLAG_NAME: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} - COVERALLS_PARALLEL: true - - coveralls: - name: Finish Coveralls - needs: pyemuCI - runs-on: ubuntu-latest - container: python:3-slim - steps: - - name: Finished - run: | - pip3 install --upgrade coveralls - coveralls --finish - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Upload Coveralls + # run: | + # coveralls + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # COVERALLS_FLAG_NAME: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} + # COVERALLS_PARALLEL: true + + - name: Coveralls + uses: AndreMiras/coveralls-python-action@develop + with: + parallel: true + flag-name: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} + + # coveralls: + # name: Finish Coveralls + # needs: pyemuCI + # runs-on: ubuntu-latest + # container: python:3-slim + # steps: + # - name: Finished + # run: | + # pip3 install --upgrade coveralls + # coveralls --finish + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + coveralls_finish: + needs: pyemuCI + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: AndreMiras/coveralls-python-action@develop + with: + parallel-finished: true From 906df29f1274a1d105e7aec1df982da43dc71106 Mon Sep 17 00:00:00 2001 From: Brioch Date: Fri, 4 Dec 2020 20:36:27 +1300 Subject: [PATCH 05/28] syntax --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7b6442b9..edfde20fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -181,13 +181,13 @@ jobs: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} coveralls_finish: - needs: pyemuCI - runs-on: ubuntu-latest - steps: - - name: Coveralls Finished - uses: AndreMiras/coveralls-python-action@develop - with: - parallel-finished: true + needs: pyemuCI + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: AndreMiras/coveralls-python-action@develop + with: + parallel-finished: true From dc275920635fdd7629fbea2547eb523d525f1186 Mon Sep 17 00:00:00 2001 From: Brioch Date: Fri, 4 Dec 2020 21:00:22 +1300 Subject: [PATCH 06/28] linux only coverage --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edfde20fe..85853d87d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -162,10 +162,11 @@ jobs: # COVERALLS_PARALLEL: true - name: Coveralls + if: ${{ runner.os == "Linux"}} uses: AndreMiras/coveralls-python-action@develop with: parallel: true - flag-name: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} + flag-name: ${{ matrix.python-version }}-${{ matrix.test-path }} # coveralls: # name: Finish Coveralls From d2fade09f86b0b7414f233b9cc52e56fd275ef76 Mon Sep 17 00:00:00 2001 From: Brioch Date: Fri, 4 Dec 2020 21:06:11 +1300 Subject: [PATCH 07/28] inverted commas --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85853d87d..d12c5af4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -162,7 +162,7 @@ jobs: # COVERALLS_PARALLEL: true - name: Coveralls - if: ${{ runner.os == "Linux"}} + if: ${{ runner.os == 'Linux'}} uses: AndreMiras/coveralls-python-action@develop with: parallel: true From eb6b6870596621cfb1f17adf746396cdb3162618 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 10:18:00 +1300 Subject: [PATCH 08/28] another coverage attempt --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d12c5af4b..2e47ecbed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,13 +145,15 @@ jobs: shell: bash run: | echo "$HOME/.local/bin" >> $GITHUB_PATH - ls $GITHUB_PATH + echo $GITHUB_PATH - name: ${{ matrix.test-path }} shell: bash -l {0} run: | nosetests -v --with-id --nocapture --with-timer \ - --with-coverage --cover-package=pyemu -w ./autotest ${{ matrix.test-path }} + --cover-xml --cover-xml-file=../coverage.xml \ + --with-coverage --cover-package=pyemu \ + -w ./autotest ${{ matrix.test-path }} # - name: Upload Coveralls # run: | @@ -162,10 +164,11 @@ jobs: # COVERALLS_PARALLEL: true - name: Coveralls - if: ${{ runner.os == 'Linux'}} + if: ${{ runner.os == 'Linux' }} uses: AndreMiras/coveralls-python-action@develop with: parallel: true + debug: true flag-name: ${{ matrix.python-version }}-${{ matrix.test-path }} # coveralls: @@ -189,6 +192,7 @@ jobs: uses: AndreMiras/coveralls-python-action@develop with: parallel-finished: true + debug: true From 42e49ee262c1c5927b91ba701e185d9414fcf65c Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 10:37:56 +1300 Subject: [PATCH 09/28] relative_files --- .coveragerc | 1 + .github/workflows/ci.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 68140233e..2fcc5b405 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,7 @@ [run] source = pyemu parallel = True +relative_files = True omit = */python?.?/* */lib-python/?.?/*.py diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e47ecbed..47215802c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,7 +151,6 @@ jobs: shell: bash -l {0} run: | nosetests -v --with-id --nocapture --with-timer \ - --cover-xml --cover-xml-file=../coverage.xml \ --with-coverage --cover-package=pyemu \ -w ./autotest ${{ matrix.test-path }} From b7ce1e56b394e5a2202cdfc9e48368db7026cc3f Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 10:39:57 +1300 Subject: [PATCH 10/28] simplfy matrix for coverage tests --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47215802c..afb1a4df7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,8 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, ubuntu-latest, macos-latest] - python-version: [3.8, 3.7, 3.6] # , 3.7, 3.6] + os: [ubuntu-latest] #, windows-latest, macos-latest] + python-version: [3.8] #, 3.7, 3.6] # , 3.7, 3.6] run-type: [std] test-path: [ "pst_tests_2.py", From 2fbebac1b06c0fe74762a31572f29ae2b3a3e1fb Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 11:15:27 +1300 Subject: [PATCH 11/28] more coverage --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afb1a4df7..d392228bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,12 +17,12 @@ jobs: python-version: [3.8] #, 3.7, 3.6] # , 3.7, 3.6] run-type: [std] test-path: [ - "pst_tests_2.py", - "utils_tests.py", - "pst_from_tests.py", - "pst_tests.py", + # "utils_tests.py", + # "pst_tests_2.py", + # "pst_from_tests.py", + # "pst_tests.py", + # "en_tests.py", "full_meal_deal_tests.py", - "en_tests.py", "la_tests.py", "plot_tests.py", "moouu_tests.py", @@ -151,8 +151,8 @@ jobs: shell: bash -l {0} run: | nosetests -v --with-id --nocapture --with-timer \ - --with-coverage --cover-package=pyemu \ - -w ./autotest ${{ matrix.test-path }} + --with-coverage -w ./autotest --cover-package=pyemu \ + ${{ matrix.test-path }} # - name: Upload Coveralls # run: | From 10ba1e70e3ec47f45837fec88f0d043dff5d3a34 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 12:10:49 +1300 Subject: [PATCH 12/28] Explicit add python nose --- .github/workflows/ci.yml | 10 +++++----- etc/environment.yml | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d392228bf..70f75f18a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,11 +38,11 @@ jobs: python-version: 3.7 - os: windows-latest python-version: 3.6 - include: - - os: ubuntu-latest - python-version: 3.8 - run-type: nb - test-path: autotest_notebooks.py + # include: + # - os: ubuntu-latest + # python-version: 3.8 + # run-type: nb + # test-path: autotest_notebooks.py steps: diff --git a/etc/environment.yml b/etc/environment.yml index 9384c9141..adc3a0127 100644 --- a/etc/environment.yml +++ b/etc/environment.yml @@ -10,3 +10,4 @@ dependencies: - matplotlib - coverage - coveralls + - nose From c7b6fed5bc5f47760d3c8716e48d1e8a445d66ad Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 13:28:56 +1300 Subject: [PATCH 13/28] more random coverage tests - specify xml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70f75f18a..fc2b9885c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,7 +151,7 @@ jobs: shell: bash -l {0} run: | nosetests -v --with-id --nocapture --with-timer \ - --with-coverage -w ./autotest --cover-package=pyemu \ + --with-coverage --cover-xml -w ./autotest --cover-package=pyemu \ ${{ matrix.test-path }} # - name: Upload Coveralls From 0e04f368120387b7e0d409683805b2846a02509b Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 13:58:21 +1300 Subject: [PATCH 14/28] and more --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc2b9885c..9425ed916 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,7 +150,7 @@ jobs: - name: ${{ matrix.test-path }} shell: bash -l {0} run: | - nosetests -v --with-id --nocapture --with-timer \ + coverage run nose -v --with-id --nocapture --with-timer \ --with-coverage --cover-xml -w ./autotest --cover-package=pyemu \ ${{ matrix.test-path }} From 0e74a335e9da90e54f240f95d08c1a9508f6d1eb Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 14:08:50 +1300 Subject: [PATCH 15/28] and more --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9425ed916..bb53e895b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,7 +150,7 @@ jobs: - name: ${{ matrix.test-path }} shell: bash -l {0} run: | - coverage run nose -v --with-id --nocapture --with-timer \ + coverage run -m nose -v --with-id --nocapture --with-timer \ --with-coverage --cover-xml -w ./autotest --cover-package=pyemu \ ${{ matrix.test-path }} From 12ff39c11989ef43ec6aecd9535656e4781be7ff Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 14:24:46 +1300 Subject: [PATCH 16/28] progress? run nose from coverage --- .github/workflows/ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb53e895b..49649f787 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,11 @@ jobs: python-version: [3.8] #, 3.7, 3.6] # , 3.7, 3.6] run-type: [std] test-path: [ - # "utils_tests.py", - # "pst_tests_2.py", - # "pst_from_tests.py", - # "pst_tests.py", - # "en_tests.py", + "utils_tests.py", + "pst_tests_2.py", + "pst_from_tests.py", + "pst_tests.py", + "en_tests.py", "full_meal_deal_tests.py", "la_tests.py", "plot_tests.py", @@ -38,11 +38,11 @@ jobs: python-version: 3.7 - os: windows-latest python-version: 3.6 - # include: - # - os: ubuntu-latest - # python-version: 3.8 - # run-type: nb - # test-path: autotest_notebooks.py + include: + - os: ubuntu-latest + python-version: 3.8 + run-type: nb + test-path: autotest_notebooks.py steps: @@ -151,7 +151,7 @@ jobs: shell: bash -l {0} run: | coverage run -m nose -v --with-id --nocapture --with-timer \ - --with-coverage --cover-xml -w ./autotest --cover-package=pyemu \ + --with-coverage -w ./autotest --cover-package=pyemu \ ${{ matrix.test-path }} # - name: Upload Coveralls From aa5b1e9291557139cd7d273b1964e2cc251b931c Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 14:54:02 +1300 Subject: [PATCH 17/28] converging --- .github/workflows/ci.yml | 82 ++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49649f787..92bff798b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,12 +17,12 @@ jobs: python-version: [3.8] #, 3.7, 3.6] # , 3.7, 3.6] run-type: [std] test-path: [ - "utils_tests.py", - "pst_tests_2.py", - "pst_from_tests.py", - "pst_tests.py", - "en_tests.py", - "full_meal_deal_tests.py", + # "utils_tests.py", + # "pst_tests_2.py", + # "pst_from_tests.py", + # "pst_tests.py", + # "en_tests.py", + # "full_meal_deal_tests.py", "la_tests.py", "plot_tests.py", "moouu_tests.py", @@ -154,44 +154,44 @@ jobs: --with-coverage -w ./autotest --cover-package=pyemu \ ${{ matrix.test-path }} - # - name: Upload Coveralls - # run: | - # coveralls - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # COVERALLS_FLAG_NAME: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} - # COVERALLS_PARALLEL: true - - - name: Coveralls - if: ${{ runner.os == 'Linux' }} - uses: AndreMiras/coveralls-python-action@develop - with: - parallel: true - debug: true - flag-name: ${{ matrix.python-version }}-${{ matrix.test-path }} + - name: Upload Coveralls + run: | + coveralls + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_FLAG_NAME: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} + COVERALLS_PARALLEL: true + + # - name: Coveralls + # if: ${{ runner.os == 'Linux' }} + # uses: AndreMiras/coveralls-python-action@develop + # with: + # parallel: true + # debug: true + # flag-name: ${{ matrix.python-version }}-${{ matrix.test-path }} + + coveralls: + name: Finish Coveralls + needs: pyemuCI + runs-on: ubuntu-latest + container: python:3-slim + steps: + - name: Finished + run: | + pip3 install --upgrade coveralls + coveralls --finish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # coveralls: - # name: Finish Coveralls + # coveralls_finish: # needs: pyemuCI # runs-on: ubuntu-latest - # container: python:3-slim - # steps: - # - name: Finished - # run: | - # pip3 install --upgrade coveralls - # coveralls --finish - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - coveralls_finish: - needs: pyemuCI - runs-on: ubuntu-latest - steps: - - name: Coveralls Finished - uses: AndreMiras/coveralls-python-action@develop - with: - parallel-finished: true - debug: true + # steps: + # - name: Coveralls Finished + # uses: AndreMiras/coveralls-python-action@develop + # with: + # parallel-finished: true + # debug: true From 57a6596d467dcdf9d05e877be66a89fbde0ec3ba Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 15:14:01 +1300 Subject: [PATCH 18/28] testing coverallsapp again --- .github/workflows/ci.yml | 66 +++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92bff798b..5444e9932 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,11 +38,11 @@ jobs: python-version: 3.7 - os: windows-latest python-version: 3.6 - include: - - os: ubuntu-latest - python-version: 3.8 - run-type: nb - test-path: autotest_notebooks.py + # include: + # - os: ubuntu-latest + # python-version: 3.8 + # run-type: nb + # test-path: autotest_notebooks.py steps: @@ -154,13 +154,13 @@ jobs: --with-coverage -w ./autotest --cover-package=pyemu \ ${{ matrix.test-path }} - - name: Upload Coveralls - run: | - coveralls - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_FLAG_NAME: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} - COVERALLS_PARALLEL: true + # - name: Upload Coveralls + # run: | + # coveralls + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # COVERALLS_FLAG_NAME: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} + # COVERALLS_PARALLEL: true # - name: Coveralls # if: ${{ runner.os == 'Linux' }} @@ -170,18 +170,25 @@ jobs: # debug: true # flag-name: ${{ matrix.python-version }}-${{ matrix.test-path }} - coveralls: - name: Finish Coveralls - needs: pyemuCI - runs-on: ubuntu-latest - container: python:3-slim - steps: - - name: Finished - run: | - pip3 install --upgrade coveralls - coveralls --finish - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Coveralls Parallel + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.github_token }} + flag-name: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} + parallel: true + + # coveralls: + # name: Finish Coveralls + # needs: pyemuCI + # runs-on: ubuntu-latest + # container: python:3-slim + # steps: + # - name: Finished + # run: | + # pip3 install --upgrade coveralls + # coveralls --finish + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # coveralls_finish: # needs: pyemuCI @@ -192,6 +199,15 @@ jobs: # with: # parallel-finished: true # debug: true - + + finish: + needs: pyemuCI + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.github_token }} + parallel-finished: true From 1d7714b852a54c806fecfba2a135d75dd8ca0bc4 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 15:15:18 +1300 Subject: [PATCH 19/28] testing coverallsapp again --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5444e9932..40368f264 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,13 +201,13 @@ jobs: # debug: true finish: - needs: pyemuCI - runs-on: ubuntu-latest - steps: - - name: Coveralls Finished - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.github_token }} - parallel-finished: true + needs: pyemuCI + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.github_token }} + parallel-finished: true From 77bc8b30f63db0f35dc935a66db0a269d64edb14 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 15:30:16 +1300 Subject: [PATCH 20/28] linux only coverge --- .github/workflows/ci.yml | 76 ++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40368f264..cf598adb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,16 +13,16 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] #, windows-latest, macos-latest] - python-version: [3.8] #, 3.7, 3.6] # , 3.7, 3.6] + os: [ubuntu-latest, windows-latest, macos-latest] + python-version: [3.8, 3.7, 3.6] # , 3.7, 3.6] run-type: [std] test-path: [ - # "utils_tests.py", - # "pst_tests_2.py", - # "pst_from_tests.py", - # "pst_tests.py", - # "en_tests.py", - # "full_meal_deal_tests.py", + "utils_tests.py", + "pst_tests_2.py", + "pst_from_tests.py", + "pst_tests.py", + "en_tests.py", + "full_meal_deal_tests.py", "la_tests.py", "plot_tests.py", "moouu_tests.py", @@ -38,11 +38,11 @@ jobs: python-version: 3.7 - os: windows-latest python-version: 3.6 - # include: - # - os: ubuntu-latest - # python-version: 3.8 - # run-type: nb - # test-path: autotest_notebooks.py + include: + - os: ubuntu-latest + python-version: 3.8 + run-type: nb + test-path: autotest_notebooks.py steps: @@ -162,20 +162,20 @@ jobs: # COVERALLS_FLAG_NAME: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} # COVERALLS_PARALLEL: true - # - name: Coveralls - # if: ${{ runner.os == 'Linux' }} - # uses: AndreMiras/coveralls-python-action@develop - # with: - # parallel: true - # debug: true - # flag-name: ${{ matrix.python-version }}-${{ matrix.test-path }} - - - name: Coveralls Parallel - uses: coverallsapp/github-action@master + - name: Coveralls + if: ${{ runner.os == 'Linux' }} + uses: AndreMiras/coveralls-python-action@develop with: - github-token: ${{ secrets.github_token }} - flag-name: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} parallel: true + debug: true + flag-name: ${{ matrix.python-version }}-${{ matrix.test-path }} + + # - name: Coveralls Parallel + # uses: coverallsapp/github-action@master + # with: + # github-token: ${{ secrets.github_token }} + # flag-name: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.test-path }} + # parallel: true # coveralls: # name: Finish Coveralls @@ -190,24 +190,24 @@ jobs: # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # coveralls_finish: - # needs: pyemuCI - # runs-on: ubuntu-latest - # steps: - # - name: Coveralls Finished - # uses: AndreMiras/coveralls-python-action@develop - # with: - # parallel-finished: true - # debug: true - - finish: + coveralls_finish: needs: pyemuCI runs-on: ubuntu-latest steps: - name: Coveralls Finished - uses: coverallsapp/github-action@master + uses: AndreMiras/coveralls-python-action@develop with: - github-token: ${{ secrets.github_token }} parallel-finished: true + debug: true + + # finish: + # needs: pyemuCI + # runs-on: ubuntu-latest + # steps: + # - name: Coveralls Finished + # uses: coverallsapp/github-action@master + # with: + # github-token: ${{ secrets.github_token }} + # parallel-finished: true From 9b7391121693fb1e674553c3ba874ead9dca13c5 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 16:32:39 +1300 Subject: [PATCH 21/28] testing sphinx build, dropping excess from travis --- .github/workflows/ci.yml | 2 +- .github/workflows/docs.yml | 18 ++++++++++++++++++ .travis.yml | 10 +++++----- 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/docs.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf598adb0..ad03000bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -163,7 +163,7 @@ jobs: # COVERALLS_PARALLEL: true - name: Coveralls - if: ${{ runner.os == 'Linux' }} + if: ${{ runner.os == 'Linux' && matrix.python-version > 3.6 }} uses: AndreMiras/coveralls-python-action@develop with: parallel: true diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 000000000..d13f15be7 --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,18 @@ +name: pyemu sphinx docs + +on: + schedule: + - cron: '0 8 * * *' # run at 8 AM UTC (12 am PST) + push: + pull_request: + +jobs: + sphinx: + needs: pyemuCI + runs-on: windows-latest + steps: + - name: make docs + run: | + cd docs + make html + cd .. \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 367ce1a48..836c00e3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,10 +95,10 @@ script: - export PYTHONPATH=$PYTHONPATH:. - nosetests -v --with-id --nocapture --with-timer -w ./autotest --with-coverage --cover-package=pyemu $TEST_SCRIPT -after_success: - - cd docs - - make html - - cd .. - - coveralls +# after_success: +# - cd docs +# - make html +# - cd .. +# - coveralls From 68f620e2f1e048345a909bd61d3069aef1e9f928 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 16:35:45 +1300 Subject: [PATCH 22/28] testing sphinx build, dropping excess from travis --- .github/workflows/ci.yml | 9 +++++++++ .github/workflows/docs.yml | 18 ------------------ 2 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 .github/workflows/docs.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad03000bd..365aad443 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -210,4 +210,13 @@ jobs: # github-token: ${{ secrets.github_token }} # parallel-finished: true + sphinx: + needs: pyemuCI + runs-on: windows-latest + steps: + - name: make docs + run: | + cd docs + make html + cd .. diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index d13f15be7..000000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: pyemu sphinx docs - -on: - schedule: - - cron: '0 8 * * *' # run at 8 AM UTC (12 am PST) - push: - pull_request: - -jobs: - sphinx: - needs: pyemuCI - runs-on: windows-latest - steps: - - name: make docs - run: | - cd docs - make html - cd .. \ No newline at end of file From 5305844aa3965e2b7b19110db61a0d1f03b34d77 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 19:51:39 +1300 Subject: [PATCH 23/28] another sphinx attempt --- .github/workflows/ci.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 365aad443..62bc40f43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,16 +13,16 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - python-version: [3.8, 3.7, 3.6] # , 3.7, 3.6] + os: [ubuntu-latest] #, windows-latest, macos-latest] + python-version: [3.8] #, 3.7, 3.6] # , 3.7, 3.6] run-type: [std] test-path: [ - "utils_tests.py", - "pst_tests_2.py", - "pst_from_tests.py", - "pst_tests.py", - "en_tests.py", - "full_meal_deal_tests.py", + # "utils_tests.py", + # "pst_tests_2.py", + # "pst_from_tests.py", + # "pst_tests.py", + # "en_tests.py", + # "full_meal_deal_tests.py", "la_tests.py", "plot_tests.py", "moouu_tests.py", @@ -38,11 +38,11 @@ jobs: python-version: 3.7 - os: windows-latest python-version: 3.6 - include: - - os: ubuntu-latest - python-version: 3.8 - run-type: nb - test-path: autotest_notebooks.py + # include: + # - os: ubuntu-latest + # python-version: 3.8 + # run-type: nb + # test-path: autotest_notebooks.py steps: @@ -214,6 +214,7 @@ jobs: needs: pyemuCI runs-on: windows-latest steps: + - uses: actions/checkout@v2.3.4 - name: make docs run: | cd docs From cbb82bc9fc7c6b4008f4c9c35212a30e9dd8d05f Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 20:37:30 +1300 Subject: [PATCH 24/28] gha sphinx --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62bc40f43..bcc6443de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -212,12 +212,11 @@ jobs: sphinx: needs: pyemuCI - runs-on: windows-latest + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2 + - uses: ammaraskar/sphinx-action@master - name: make docs - run: | - cd docs - make html - cd .. + with: + docs-folder: "docs/" From d81f0f48883eb8416646c8b930842968e264c141 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 20:39:34 +1300 Subject: [PATCH 25/28] gha sphinx --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcc6443de..72ef76587 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -216,7 +216,6 @@ jobs: steps: - uses: actions/checkout@v2 - uses: ammaraskar/sphinx-action@master - - name: make docs - with: - docs-folder: "docs/" + with: + docs-folder: "docs/" From 9af1d4e174b50f1fe23e99196f2727b6b8930807 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 20:40:49 +1300 Subject: [PATCH 26/28] gha sphinx --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72ef76587..3464d9530 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -216,6 +216,6 @@ jobs: steps: - uses: actions/checkout@v2 - uses: ammaraskar/sphinx-action@master - with: - docs-folder: "docs/" + with: + docs-folder: "docs/" From 4d6eec1d6d743f37cb8921112c8dc2b5e42daef2 Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 21:11:19 +1300 Subject: [PATCH 27/28] abandoning sphinx for now --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3464d9530..5ea7bc12a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,16 +13,16 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] #, windows-latest, macos-latest] - python-version: [3.8] #, 3.7, 3.6] # , 3.7, 3.6] + os: [ubuntu-latest, windows-latest, macos-latest] + python-version: [3.8, 3.7, 3.6] # , 3.7, 3.6] run-type: [std] test-path: [ - # "utils_tests.py", - # "pst_tests_2.py", - # "pst_from_tests.py", - # "pst_tests.py", - # "en_tests.py", - # "full_meal_deal_tests.py", + "utils_tests.py", + "pst_tests_2.py", + "pst_from_tests.py", + "pst_tests.py", + "en_tests.py", + "full_meal_deal_tests.py", "la_tests.py", "plot_tests.py", "moouu_tests.py", @@ -38,11 +38,11 @@ jobs: python-version: 3.7 - os: windows-latest python-version: 3.6 - # include: - # - os: ubuntu-latest - # python-version: 3.8 - # run-type: nb - # test-path: autotest_notebooks.py + include: + - os: ubuntu-latest + python-version: 3.8 + run-type: nb + test-path: autotest_notebooks.py steps: @@ -210,12 +210,12 @@ jobs: # github-token: ${{ secrets.github_token }} # parallel-finished: true - sphinx: - needs: pyemuCI - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: ammaraskar/sphinx-action@master - with: - docs-folder: "docs/" + # sphinx: + # needs: pyemuCI + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v2 + # - uses: ammaraskar/sphinx-action@master + # with: + # docs-folder: "docs/" From 8282e6714595e557101f3ffa00c9cf195a1201ce Mon Sep 17 00:00:00 2001 From: Brioch Date: Sat, 5 Dec 2020 21:21:18 +1300 Subject: [PATCH 28/28] keep make docs in travis.yml for now --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 836c00e3b..f54d5e44f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,10 +95,10 @@ script: - export PYTHONPATH=$PYTHONPATH:. - nosetests -v --with-id --nocapture --with-timer -w ./autotest --with-coverage --cover-package=pyemu $TEST_SCRIPT -# after_success: -# - cd docs -# - make html -# - cd .. +after_success: + - cd docs + - make html + - cd .. # - coveralls