Skip to content

Fix GitHub Actions workflows #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdickinson merged 9 commits into from
Feb 8, 2023
Merged

Fix GitHub Actions workflows #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fee765f
Temporarily pin copyright end year
mdickinson Feb 7, 2023
72ee92d
Drop Python 3.6 for non-EDM test workflow
mdickinson Feb 7, 2023
3f16af1
Update EDM and setup-edm-action versions
mdickinson Feb 7, 2023
389a167
Don't upgrade pip - actions/setup-python already provides the latest …
mdickinson Feb 7, 2023
3ef5e8a
Don't extend to 3.11 just yet
mdickinson Feb 7, 2023
77c4fea
Use xvfb-run instead of GabrielBB/xvbf-action
mdickinson Feb 7, 2023
3986055
Fix syntax error
mdickinson Feb 7, 2023
e64ffb2
Experiment: see if we need xvfb-run at all
mdickinson Feb 7, 2023
c80bbf7
Merge branch 'main' into fix-ci
mdickinson Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/ets-from-source.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

env:
INSTALL_EDM_VERSION: 3.3.1
INSTALL_EDM_VERSION: 3.5.0

jobs:

Expand Down Expand Up @@ -36,15 +36,13 @@ 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
run: python etstool.py install --runtime=${{ matrix.runtime }} --source
- 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 }}

notify-on-failure:
needs: test-with-edm
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-on-pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/test-with-edm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand All @@ -45,6 +45,4 @@ jobs:
run: python etstool.py flake8 --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 }}
3 changes: 1 addition & 2 deletions .github/workflows/test-with-pip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']

runs-on: ${{ matrix.os }}

Expand All @@ -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: |
Expand Down
4 changes: 3 additions & 1 deletion etstool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down