Skip to content

Commit

Permalink
chore: bump dependencies versions (#462)
Browse files Browse the repository at this point in the history
* ci: change manual tests running

* ci: change workflow pdm scripts

* chore: change dependencies minimal versions

* fix(pre-commit.ci): auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* chore: regenerate lock file

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
RaczeQ and pre-commit-ci[bot] authored Aug 29, 2024
1 parent 288509b commit d6e70ba
Show file tree
Hide file tree
Showing 8 changed files with 538 additions and 86 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Regenerate lock with environment markers
run: pdm lock --update-reuse --strategy inherit_metadata
- name: Generate requirements.txt
run: pdm export --no-default -G docs -G visualization -f requirements -o requirements.txt
run: pdm export --no-default -G osm -G voronoi -G gtfs -G plotting -G torch -dG docs -dG visualization -f requirements -o requirements.txt
- name: Install dependencies
run: pip install --no-deps -r requirements.txt
- name: Install nbconvert dependency
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Regenerate lock with environment markers
run: pdm lock --update-reuse --strategy inherit_metadata
- name: Generate requirements.txt
run: pdm export --no-default -G docs -G visualization -f requirements -o requirements.txt
run: pdm export --no-default -G osm -G voronoi -G gtfs -G plotting -G torch -dG docs -dG visualization -f requirements -o requirements.txt
- name: Install dependencies
run: pip install --no-deps -r requirements.txt
- name: Install nbconvert dependency
Expand Down
24 changes: 9 additions & 15 deletions .github/workflows/manual_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [workflow_dispatch, workflow_call]

jobs:
run-tests-newest:
name: Run tests 🛠️ on multiple systems 🖥️ and Python 🐍 versions
name: Run tests 🛠️ on multiple systems 🖥️ and Python 🐍 versions (newest dependencies)
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -20,6 +20,7 @@ jobs:
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
COLUMNS: 120
steps:
- uses: actions/checkout@v3
- name: Setup Python ${{ matrix.python-version }}
Expand All @@ -29,27 +30,20 @@ jobs:
- name: Install pdm
run: pip install pdm
- name: Generate lock with newest dependencies
run: pdm lock --lockfile pdm.newest.lock --strategy no_cross_platform -dG:all
run: pdm lock --lockfile pdm.newest.lock --strategy no_cross_platform -G osm -G voronoi -G gtfs -G plotting -G torch -dG test
- name: Install srai and tests dependencies
run: pdm install --lockfile pdm.newest.lock -dG:all
run: pdm install --lockfile pdm.newest.lock -G osm -G voronoi -G gtfs -G plotting -G torch -dG test --skip=post_install
- name: Run tests with pytest
run: pdm run pytest -v --durations=20 tests

run-tests-oldest:
name: Run tests 🛠️ on multiple systems 🖥️ and Python 🐍 versions
name: Run tests 🛠️ on multiple systems 🖥️ and Python 🐍 versions (oldest dependencies)
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: ["3.9", "3.10", "3.11", "3.12"]
include:
- os: macos-latest
python-version: "3.12"
- os: macos-13
python-version: "3.12"
- os: windows-latest
python-version: "3.12"
os: [ubuntu-latest, macos-13, macos-latest, windows-latest]
python-version: ["3.9"]
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
Expand All @@ -62,8 +56,8 @@ jobs:
- name: Install pdm
run: pip install pdm
- name: Generate lock with oldest dependencies
run: pdm lock --lockfile pdm.oldest.lock --strategy no_cross_platform,direct_minimal_versions -dG:all
run: pdm lock --lockfile pdm.oldest.lock --strategy no_cross_platform,direct_minimal_versions -G osm -G voronoi -G gtfs -G plotting -G torch -dG test
- name: Install srai and tests dependencies
run: pdm install --lockfile pdm.oldest.lock -dG:all
run: pdm install --lockfile pdm.oldest.lock -G osm -G voronoi -G gtfs -G plotting -G torch -dG test --skip=post_install
- name: Run tests with pytest
run: pdm run pytest -v --durations=20 tests
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
default_stages: [commit]
repos:
- repo: https://github.com/compilerla/conventional-pre-commit
rev: v3.2.0
rev: v3.4.0
hooks:
- id: conventional-pre-commit
stages: [commit-msg]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 'v0.3.7'
rev: 'v0.5.6'
hooks:
- id: ruff
types_or: [ python, pyi, jupyter ]
Expand All @@ -22,13 +22,13 @@ repos:
additional_dependencies: [tomli]
args: ["--in-place", "--config", "./pyproject.toml"]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.9.0
rev: v1.11.1
hooks:
- id: mypy
args: ["--config-file", "pyproject.toml"]
additional_dependencies: ['types-requests', 'types-six']
- repo: https://github.com/pdm-project/pdm
rev: 2.14.0
rev: 2.17.3
hooks:
- id: pdm-lock-check
- id: pdm-export
Expand Down
Loading

0 comments on commit d6e70ba

Please sign in to comment.