Skip to content

Commit

Permalink
Reviewed all workflows to bump version to latest and ensure py3.12 is…
Browse files Browse the repository at this point in the history
… included in testing.
  • Loading branch information
jbousquin committed Aug 19, 2024
1 parent dfbd3cb commit 9ebe2fe
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 29 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/documentation_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
build_doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Pages
id: pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v5
- uses: r-lib/actions/setup-pandoc@v2
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
- name: Install dependencies
run: |
pip install -r requirements.txt
Expand All @@ -32,7 +32,7 @@ jobs:
cd docs
make html
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v4
with:
# Upload entire repository
path: './docs/build/html'
Expand All @@ -45,4 +45,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
8 changes: 4 additions & 4 deletions .github/workflows/documentation_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
build_doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Pages
id: pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v5
- uses: r-lib/actions/setup-pandoc@v2
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install dependencies
Expand All @@ -38,7 +38,7 @@ jobs:
make html
make doctest
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v4
with:
# Upload entire repository
path: './docs/build/html'
13 changes: 6 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
name: lint

on:
push:
branches:
[pyOpenSci-review]
pull_request:
branches:
[pyOpenSci-review]

[main]
push:
branches:
[main, dev]

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.x

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nb_refresh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Update pip and install depends
Expand All @@ -33,7 +33,7 @@ jobs:
jupyter nbconvert --to notebook --execute demos/Harmonize_Tampa_Detailed.ipynb --ExecutePreprocessor.kernel_name='python3' --output ../demos/Harmonize_Tampa_Detailed
jupyter nbconvert --to notebook --execute demos/Harmonize_Tampa_Simple.ipynb --ExecutePreprocessor.kernel_name='python3' --output ../demos/Harmonize_Tampa_Simple
- name: commit updated notebook
uses: EndBug/add-and-commit@v7
uses: EndBug/add-and-commit@v9
with:
author_name: 'github-actions[bot]'
author_email: 'github-actions[bot]@users.noreply.github.com'
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
name: test

on:
push:
branches:
[main]
pull_request:
branches:
[main]
push:
branches:
[main, dev]
schedule:
- cron: '11 1 1 * *'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
test:
Expand All @@ -19,16 +21,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
#exclude:
# - os: windows-latest
# python-version: "3.7"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -63,6 +65,11 @@ jobs:
pip install https://github.com/cgohlke/geospatial-wheels/releases/download/v2023.7.16/GDAL-3.7.1-cp311-cp311-win_amd64.whl
pip install https://github.com/cgohlke/geospatial-wheels/releases/download/v2023.7.16/Fiona-1.9.4.post1-cp311-cp311-win_amd64.whl
- if: ${{ (matrix.os == 'windows-latest') && (matrix.python-version == 3.12) }}
run: |
pip install https://github.com/cgohlke/geospatial-wheels/releases/download/v2024.2.18/GDAL-3.8.4-cp312-cp312-win_amd64.whl
pip install https://github.com/cgohlke/geospatial-wheels/releases/download/v2024.2.18/fiona-1.9.5-cp312-cp312-win_amd64.whl
- name: Install package and dependencies
run: |
python -m pip install --no-deps .
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_r.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: R-test

on:
push:
branches:
[main]
pull_request:
branches:
[main]
push:
branches:
[main, dev]
schedule:
- cron: '11 1 1 * *'
# Allows you to run this workflow manually from the Actions tab
Expand All @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [windows-latest, macos-latest]
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sphinxcontrib-spelling
nbsphinx
nbsphinx_link
notebook
ruff

0 comments on commit 9ebe2fe

Please sign in to comment.