diff --git a/.github/workflows/python-package.yaml b/.github/workflows/python-package.yaml index 09af913..2259fff 100644 --- a/.github/workflows/python-package.yaml +++ b/.github/workflows/python-package.yaml @@ -6,7 +6,6 @@ on: jobs: test: - name: Test Python ${{ matrix.python-version }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: @@ -21,12 +20,11 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13" steps: - uses: actions/checkout@v4 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -34,8 +32,7 @@ jobs: # ensure we're using *our* dotenv during testing and not some other one # installed on the system, e.g. gh machines apparently have sometimes # the ruby dotenv package installed - pip install --upgrade -r requirements-dev.txt - pip install -e .['dev'] + pip install --upgrade -e .['dev'] make test lint: diff --git a/.readthedocs.yaml b/.readthedocs.yaml index ac9063d..43da301 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,6 +8,9 @@ build: mkdocs: configuration: mkdocs.yml + python: install: - - requirements: requirements-dev.txt + - path: . + extra_requirements: + - dev diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eab1ff..afcdaa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ ## [unreleased] -* removed ruff's target-version, defaulting to pyproject's requires-python +* Added Python 3.13 to github ci +* Updated pyproject.toml to comply with latest setuptools recommendation: + * Removed License Classifier + * Use license-files to point to LICENSE file +* Removed requirements-dev.txt, relying on pyproject.toml to specify the + requirements +* Removed ruff's target-version, defaulting to pyproject's requires-python ## [3.4.1] -- 2024-08-28 diff --git a/Makefile b/Makefile index f9ac3f5..0ce44bf 100644 --- a/Makefile +++ b/Makefile @@ -15,10 +15,9 @@ endif .PHONY: all all: lint mypy test test-docs test-release -$(VENV): requirements-dev.txt pyproject.toml +$(VENV): pyproject.toml $(PY) -m venv $(VENV) - $(BIN)/pip install --upgrade -r requirements-dev.txt - $(BIN)/pip install -e .['dev'] + $(BIN)/pip install --upgrade -e .['dev'] touch $(VENV) # in this target, our tests are using Popen etc to run other scrips. Therefore diff --git a/pyproject.toml b/pyproject.toml index 3af9a86..d8e5a1b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,13 +10,12 @@ authors = [ description = "Simple dotenv CLI." keywords = ["dotenv", "cli", ".env"] readme = "README.md" -license = { file = "LICENSE" } +license-files = ["LICENSE"] requires-python = ">=3.9" dynamic = ["version"] classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", ] diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index 559f161..0000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,8 +0,0 @@ -build==1.2.2.post1 -mkdocs-material==9.5.49 -mkdocs==1.6.1 -mypy==1.14.1 -pytest-cov==6.0.0 -pytest==8.3.4 -ruff==0.8.6 -twine==6.0.1