From fee765fb81f68096a51e743f14cc94ed60fa46ef Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 7 Feb 2023 19:25:30 +0000 Subject: [PATCH 1/8] Temporarily pin copyright end year --- etstool.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etstool.py b/etstool.py index adc6d17c..1cc352bb 100644 --- a/etstool.py +++ b/etstool.py @@ -303,7 +303,9 @@ def flake8(edm, runtime, environment): "integrationtests", ] commands = [ - "{edm} run -e {environment} -- python -m flake8 " + " ".join(targets) + "{edm} run -e {environment} -- python -m flake8 " + + "--copyright-end-year 2022 " + + " ".join(targets) ] execute(commands, parameters) From 72ee92d74521c7b95e3f51636cc396357cf42c56 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 7 Feb 2023 19:30:19 +0000 Subject: [PATCH 2/8] Drop Python 3.6 for non-EDM test workflow --- .github/workflows/test-with-pip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 6dbe224d..7eec0675 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.6', '3.8', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] runs-on: ${{ matrix.os }} From 3f16af180a51de83122f0fb45c934fed3fe7af87 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 7 Feb 2023 19:33:40 +0000 Subject: [PATCH 3/8] Update EDM and setup-edm-action versions --- .github/workflows/ets-from-source.yml | 4 ++-- .github/workflows/test-with-edm.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ets-from-source.yml b/.github/workflows/ets-from-source.yml index 43669ea0..fbc00937 100644 --- a/.github/workflows/ets-from-source.yml +++ b/.github/workflows/ets-from-source.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: env: - INSTALL_EDM_VERSION: 3.3.1 + INSTALL_EDM_VERSION: 3.5.0 jobs: @@ -36,7 +36,7 @@ jobs: path: ~/.cache key: ${{ runner.os }}-${{ matrix.runtime }}-${{ hashFiles('etstool.py') }} - name: Setup EDM - uses: enthought/setup-edm-action@v1 + uses: enthought/setup-edm-action@v2 with: edm-version: ${{ env.INSTALL_EDM_VERSION }} - name: Install test environment diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index 47fccba4..e038b3ed 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -7,7 +7,7 @@ name: Test with EDM on: [pull_request, workflow_dispatch] env: - INSTALL_EDM_VERSION: 3.3.1 + INSTALL_EDM_VERSION: 3.5.0 jobs: @@ -36,7 +36,7 @@ jobs: path: ~/.cache key: ${{ runner.os }}-${{ matrix.runtime }}-${{ hashFiles('etstool.py') }} - name: Setup EDM - uses: enthought/setup-edm-action@v1 + uses: enthought/setup-edm-action@v2 with: edm-version: ${{ env.INSTALL_EDM_VERSION }} - name: Install test environment From 389a1676a700c02e16db6d7da4010b0e88c6bfe2 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 7 Feb 2023 19:36:36 +0000 Subject: [PATCH 4/8] Don't upgrade pip - actions/setup-python already provides the latest version --- .github/workflows/publish-on-pypi.yml | 1 - .github/workflows/test-with-pip.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/publish-on-pypi.yml b/.github/workflows/publish-on-pypi.yml index 6ba23919..7766f36d 100644 --- a/.github/workflows/publish-on-pypi.yml +++ b/.github/workflows/publish-on-pypi.yml @@ -18,7 +18,6 @@ jobs: python-version: '3.10' - name: Install Python packages needed for build and upload run: | - python -m pip install --upgrade pip python -m pip install build twine - name: Build sdist and wheel run: | diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 7eec0675..38ceb699 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -22,7 +22,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies and local packages run: | - python -m pip install --upgrade pip python -m pip install .[h5,preferences] - name: Run tests run: | From 3ef5e8a010372cb162e73bfd6647d9895e055e05 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 7 Feb 2023 19:43:04 +0000 Subject: [PATCH 5/8] Don't extend to 3.11 just yet --- .github/workflows/test-with-pip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 38ceb699..35004508 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.7', '3.8', '3.9', '3.10'] runs-on: ${{ matrix.os }} From 77c4fea5c4bac07e46a73b37a0bc22f44c7919b0 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 7 Feb 2023 19:48:46 +0000 Subject: [PATCH 6/8] Use xvfb-run instead of GabrielBB/xvbf-action --- .github/workflows/ets-from-source.yml | 8 +++++--- .github/workflows/test-with-edm.yml | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ets-from-source.yml b/.github/workflows/ets-from-source.yml index fbc00937..07d9e14e 100644 --- a/.github/workflows/ets-from-source.yml +++ b/.github/workflows/ets-from-source.yml @@ -41,10 +41,12 @@ jobs: edm-version: ${{ env.INSTALL_EDM_VERSION }} - name: Install test environment run: python etstool.py install --runtime=${{ matrix.runtime }} --source + - name: Run tests under xvfb + run: xvfb-run -a python etstool.py test --runtime=${{ matrix.runtime }} + if: startsWith(matrix.os, 'ubuntu') - name: Run tests - uses: GabrielBB/xvfb-action@v1 - with: - run: python etstool.py test --runtime=${{ matrix.runtime }} + run: python etstool.py test --runtime=${{ matrix.runtime }} + if: '!startsWith(matrix.os, ''ubuntu''')' notify-on-failure: needs: test-with-edm diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index e038b3ed..c98de955 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -44,7 +44,9 @@ jobs: - name: Run style checks (only on Linux) run: python etstool.py flake8 --runtime=${{ matrix.runtime }} if: startsWith(matrix.os, 'ubuntu') + - name: Run tests under xvfb + run: xvfb-run -a python etstool.py test --runtime=${{ matrix.runtime }} + if: startsWith(matrix.os, 'ubuntu') - name: Run tests - uses: GabrielBB/xvfb-action@v1 - with: - run: python etstool.py test --runtime=${{ matrix.runtime }} + run: python etstool.py test --runtime=${{ matrix.runtime }} + if: '!startsWith(matrix.os, ''ubuntu''')' From 3986055cb887fe5f878d2a220e10e4bbe0da3f46 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 7 Feb 2023 19:53:05 +0000 Subject: [PATCH 7/8] Fix syntax error --- .github/workflows/ets-from-source.yml | 2 +- .github/workflows/test-with-edm.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ets-from-source.yml b/.github/workflows/ets-from-source.yml index 07d9e14e..9010a7c0 100644 --- a/.github/workflows/ets-from-source.yml +++ b/.github/workflows/ets-from-source.yml @@ -46,7 +46,7 @@ jobs: if: startsWith(matrix.os, 'ubuntu') - name: Run tests run: python etstool.py test --runtime=${{ matrix.runtime }} - if: '!startsWith(matrix.os, ''ubuntu''')' + if: '!startsWith(matrix.os, ''ubuntu'')' notify-on-failure: needs: test-with-edm diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index c98de955..320c59f2 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -49,4 +49,4 @@ jobs: if: startsWith(matrix.os, 'ubuntu') - name: Run tests run: python etstool.py test --runtime=${{ matrix.runtime }} - if: '!startsWith(matrix.os, ''ubuntu''')' + if: '!startsWith(matrix.os, ''ubuntu'')' From e64ffb273d468a906e00c345dec008106a7fcf9d Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 7 Feb 2023 19:55:32 +0000 Subject: [PATCH 8/8] Experiment: see if we need xvfb-run at all --- .github/workflows/ets-from-source.yml | 4 ---- .github/workflows/test-with-edm.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/ets-from-source.yml b/.github/workflows/ets-from-source.yml index 9010a7c0..522763f3 100644 --- a/.github/workflows/ets-from-source.yml +++ b/.github/workflows/ets-from-source.yml @@ -41,12 +41,8 @@ jobs: edm-version: ${{ env.INSTALL_EDM_VERSION }} - name: Install test environment run: python etstool.py install --runtime=${{ matrix.runtime }} --source - - name: Run tests under xvfb - run: xvfb-run -a python etstool.py test --runtime=${{ matrix.runtime }} - if: startsWith(matrix.os, 'ubuntu') - name: Run tests run: python etstool.py test --runtime=${{ matrix.runtime }} - if: '!startsWith(matrix.os, ''ubuntu'')' notify-on-failure: needs: test-with-edm diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index 320c59f2..8331453c 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -44,9 +44,5 @@ jobs: - name: Run style checks (only on Linux) run: python etstool.py flake8 --runtime=${{ matrix.runtime }} if: startsWith(matrix.os, 'ubuntu') - - name: Run tests under xvfb - run: xvfb-run -a python etstool.py test --runtime=${{ matrix.runtime }} - if: startsWith(matrix.os, 'ubuntu') - name: Run tests run: python etstool.py test --runtime=${{ matrix.runtime }} - if: '!startsWith(matrix.os, ''ubuntu'')'