diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 4ce4101..9e266f4 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -76,8 +76,9 @@ runs: shell: bash working-directory: dist/ run: | + python -m pip install --upgrade pip WHEEL_NAME=$(ls pyshp-*py3-none-any.whl) - python -m pip install $WHEEL_NAME[test] + python -m pip install $WHEEL_NAME --group ../Pyshp/pyproject.toml:test - name: Doctests shell: bash @@ -113,4 +114,4 @@ runs: shell: bash run: | echo Killing http server process ID: ${{ env.HTTP_SERVER_PID }} - kill ${{ env.HTTP_SERVER_PID }} \ No newline at end of file + kill ${{ env.HTTP_SERVER_PID }} diff --git a/.github/workflows/speed_test.yml b/.github/workflows/speed_test.yml index 905b162..9afd53d 100644 --- a/.github/workflows/speed_test.yml +++ b/.github/workflows/speed_test.yml @@ -44,18 +44,17 @@ jobs: name: PyShp_wheel_and_sdist path: dist + - uses: actions/checkout@v6 + with: + path: ./Pyshp + - name: Install PyShp + test deps from the wheel (downloaded in prev step) shell: bash working-directory: dist/ run: | + python -m pip install --upgrade pip WHEEL_NAME=$(ls pyshp-*py3-none-any.whl) - python -m pip install $WHEEL_NAME[test] - - - uses: actions/checkout@v6 - with: - path: ./Pyshp - - + python -m pip install $WHEEL_NAME --group ../Pyshp/pyproject.toml:test - name: Checkout shapefiles and zip file artefacts repo uses: actions/checkout@v6 diff --git a/README.md b/README.md index 123a470..831494f 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,12 @@ part of your geospatial project. # Version Changes +## 3.0.5 + +### Project structure: + - Use dependency groups for dev and test instead of optional-dependencies in pyproject.toml ([Mike Toews](https://github.com/mwtoews)) + + ## 3.0.4 ### Type checking diff --git a/changelog.txt b/changelog.txt index fd1f24c..25c9ecb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +VERSION 3.0.5 + +2026-05-18 + Project structure: + * Use dependency groups for dev and test instead of optional-dependencies in pyproject.toml (Mike Toews) + VERSION 3.0.4 2026-05-17 diff --git a/pyproject.toml b/pyproject.toml index 75a93e4..b025c38 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,14 +26,24 @@ classifiers = [ "Topic :: Software Development :: Libraries", "Topic :: Software Development :: Libraries :: Python Modules", ] -dependencies = [ -] [project.optional-dependencies] -dev = ["pyshp[test]", "pre-commit", "ruff"] -test = ["pytest"] stubs=["pyshp-stubs"] +[dependency-groups] +dev = [ + {include-group = "lint"}, + {include-group = "test"} +] +lint = [ + "mypy", + "pre-commit", + "ruff", +] +test = [ + "pytest", +] + [project.urls] Repository = "https://github.com/GeospatialPython/pyshp" diff --git a/src/shapefile.py b/src/shapefile.py index 09bca17..e9108c7 100644 --- a/src/shapefile.py +++ b/src/shapefile.py @@ -8,7 +8,7 @@ from __future__ import annotations -__version__ = "3.0.4" +__version__ = "3.0.5" import array import doctest