Skip to content

Commit

Permalink
Merge pull request #25 from dnv-opensource/update_dependencies
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
ClaasRostock authored Jul 14, 2024
2 parents 0932930 + 4ec1a25 commit 39666a6
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 24 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/_build_and_publish_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip' # cache pip dependencies
- name: Install uv
run: |
python -m pip install uv
- name: Install dependencies
run: |
pip install -r requirements-dev.txt
uv pip install --system -r requirements-dev.txt
- name: Print debugging information
run: |
echo "github.ref:" ${{github.ref}}
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/_build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip' # cache pip dependencies
- name: Install build and twine
run: pip install build twine
- name: Install uv
run: |
python -m pip install uv
- name: Install build and twine
run: |
uv pip install --system build twine
- name: Run build
run: python -m build
- name: Run twine check
Expand Down
37 changes: 24 additions & 13 deletions .github/workflows/_code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip' # cache pip dependencies
- name: Install dependencies
run: pip install -r requirements.txt
- name: Install uv
run: |
python -m pip install uv
- name: Install dependencies
run: |
uv pip install --system -r requirements.txt
- name: Install ruff
run: pip install ruff==0.5.1
run: |
uv pip install --system ruff==0.5.1
- name: Run ruff format
run: ruff format --diff .

Expand All @@ -27,11 +31,15 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip' # cache pip dependencies
- name: Install dependencies
run: pip install -r requirements.txt
- name: Install uv
run: |
python -m pip install uv
- name: Install dependencies
run: |
uv pip install --system -r requirements.txt
- name: Install ruff
run: pip install ruff==0.5.1
run: |
uv pip install --system ruff==0.5.1
- name: Run ruff check
run: ruff check --diff .

Expand All @@ -43,12 +51,15 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip' # cache pip dependencies
- name: Install dependencies
- name: Install uv
run: |
python -m pip install uv
- name: Install dependencies
run: |
pip install -r requirements.txt
pip install pytest
uv pip install --system -r requirements.txt
uv pip install --system pytest
- name: Install pyright
run: pip install pyright==1.1.371
run: |
uv pip install --system pyright==1.1.371
- name: Run pyright
run: pyright .
3 changes: 1 addition & 2 deletions .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python.version }}
cache: 'pip' # cache pip dependencies
- name: Install tox
run: python -m pip install tox
run: python -m pip install tox-uv
- name: Run pytest
run: tox -e ${{matrix.python.toxenv}}-${{matrix.platform.toxenv}}
7 changes: 3 additions & 4 deletions .github/workflows/_test_future.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Unit Tests (py312)
on: workflow_call

jobs:
test312:
test313:
name: Test on ${{matrix.python.toxenv}}-${{matrix.platform.toxenv}} (experimental)
continue-on-error: true
runs-on: ${{ matrix.platform.runner }}
Expand All @@ -16,16 +16,15 @@ jobs:
- runner: windows-latest
toxenv: windows
python:
- version: '3.13.0a2'
- version: '3.13.0-alpha - 3.13.0'
toxenv: 'py313'
steps:
- uses: actions/checkout@v4
- name: Install Python ${{ matrix.python.version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python.version }}
cache: 'pip' # cache pip dependencies
- name: Install tox
run: python -m pip install tox
run: python -m pip install tox-uv
- name: Run pytest
run: tox -e ${{matrix.python.toxenv}}-${{matrix.platform.toxenv}}
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e

## [Unreleased]

### Dependencies
* GitHub workflows: Replaced pip install tox with pip install tox-uv
* GitHub workflows: Removed cache: 'pip' for tox-uv compatibility
* GitHub workflows: Install dependencies: change singleline run statements to multiline run statements
* GitHub workflows: Add step to install 'uv' package
* GitHub workflows: Add step to install 'uv' package
* GitHub workflows: Install dependencies: change from 'pip install' to 'uv pip install'
* GitHub workflow _test_future.yml : updated Python version to 3.13.0-alpha - 3.13.0
* GitHub workflow _test_future.yml : updated name of test job to 'test313'

### Dependencies
* updated to black[jupyter]==24.4 (from black[jupyter]==23.12)
* updated to version: '==24.4' (from version: '==23.12')
Expand Down

0 comments on commit 39666a6

Please sign in to comment.