Skip to content
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.

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

fix all kind of errors from new deps versions #117

Merged
merged 12 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 21 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,24 @@ jobs:
pip install .

test:
name: pytest (${{ matrix.os }}, ${{ matrix.python-version }})
name: pytest (${{ matrix.os }}, ${{ matrix.python-version }}, packages version ${{ matrix.version }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
poetry-version: ["1.3.2"]
version: ["lock"]
include:
- python-version: "3.9"
version: "minimal"
os: "ubuntu-latest"
poetry-version: "1.3.2"
- python-version: "3.12"
version: "maximal"
os: "ubuntu-latest"
poetry-version: "1.3.2"
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -48,8 +58,18 @@ jobs:
uses: abatilo/actions-poetry@v2.0.0
with:
poetry-version: ${{ matrix.poetry-version }}
- name: update lock file
if: matrix.version == 'maximal'
run: poetry update
- name: Install dependencies
run: |
poetry install --with test
- name: use minimal versions for lock file
if: matrix.version == 'minimal'
run: |
pipx install pdm==2.15.2
poetry add 'numpy<2'
poetry run pdm lock --strategy direct_minimal_versions -v -G :all
poetry run pdm install -v -G :all
- name: Run tests with pytest
run: poetry run pytest xnemogcm/test
11 changes: 8 additions & 3 deletions .github/workflows/ci_upgrade_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ main ]
pull_request:
branches: [ main ]
# pull_request:
# branches: [ main ]
# not needed anymore on every push as it is tested in ci.yml

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -26,7 +27,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
python-version: ["3.9"]
python-version: ["3.12"]
poetry-version: ["1.3.2"]
steps:
- name: Checkout
Expand All @@ -39,6 +40,10 @@ jobs:
uses: abatilo/actions-poetry@v2.0.0
with:
poetry-version: ${{ matrix.poetry-version }}
- name: Update system
run: |
sudo apt update
sudo apt upgrade --yes
- name: Install dependencies
run: |
poetry update
Expand Down
Loading
Loading