From 0ff1625baa43f6e106720a936940a2ab3df0dd25 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:20:36 +0200 Subject: [PATCH 01/10] Removed requirements-dev.txt, updated pyproject.toml --- CHANGELOG.md | 7 ++++++- Makefile | 5 ++--- pyproject.toml | 3 +-- requirements-dev.txt | 8 -------- 4 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 requirements-dev.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eab1ff..eacb3c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,12 @@ ## [unreleased] -* removed ruff's target-version, defaulting to pyproject's requires-python +* 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 From d7ccd6e55455fffdf803cf6a2be799e3b63e71da Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:31:51 +0200 Subject: [PATCH 02/10] fix github ci --- .github/workflows/python-package.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yaml b/.github/workflows/python-package.yaml index 09af913..8c8eb15 100644 --- a/.github/workflows/python-package.yaml +++ b/.github/workflows/python-package.yaml @@ -34,8 +34,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: From e2231e51ab4c64ee9faf68f84f3dafb0f45041ec Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:31:59 +0200 Subject: [PATCH 03/10] fix mkdocs --- .readthedocs.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index ac9063d..8c6f322 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -9,5 +9,6 @@ mkdocs: configuration: mkdocs.yml python: - install: - - requirements: requirements-dev.txt + pip_install: true + extra_requirements: + - dev From 80d55cbb01a509257a3b0c27ba62029b8b731abd Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:36:34 +0200 Subject: [PATCH 04/10] added python 3.13 to github ci --- .github/workflows/python-package.yaml | 1 + CHANGELOG.md | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/python-package.yaml b/.github/workflows/python-package.yaml index 8c8eb15..3a90ee3 100644 --- a/.github/workflows/python-package.yaml +++ b/.github/workflows/python-package.yaml @@ -21,6 +21,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13" steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index eacb3c6..afcdaa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [unreleased] +* 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 From a477f575423d3cd95e52f059feb33794665f4cfb Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:45:51 +0200 Subject: [PATCH 05/10] WIP --- .readthedocs.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 8c6f322..a11a3d5 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,13 +1,3 @@ -version: 2 - -build: - os: ubuntu-22.04 - tools: - python: "3.12" - -mkdocs: - configuration: mkdocs.yml - python: pip_install: true extra_requirements: From 22a362300b32e499b7a67ae986433a53e5cf7596 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:46:52 +0200 Subject: [PATCH 06/10] WIP --- .readthedocs.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index a11a3d5..f9271d7 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,3 +1,6 @@ +build: + image: latest + python: pip_install: true extra_requirements: From 812ce44df4a8e25e6bb8489f0162b34e19696635 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:52:53 +0200 Subject: [PATCH 07/10] WIP --- .readthedocs.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index f9271d7..cb3f3f0 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,7 +1,15 @@ +version: 2 + build: - image: latest + os: ubuntu-22.04 + tools: + python: "3.12" + +mkdocs: + configuration: mkdocs.yml + python: - pip_install: true - extra_requirements: - - dev + install: + extra_requirements: + - dev From 150b8b2cd06d74cefa6256e8e83c38ba25534658 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:53:32 +0200 Subject: [PATCH 08/10] WIP --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index cb3f3f0..56ed581 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -11,5 +11,5 @@ mkdocs: python: install: - extra_requirements: + - extra_requirements: - dev From fb72037ffa9802c2b856420983aa5a5aafb4863d Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:54:29 +0200 Subject: [PATCH 09/10] WIP --- .readthedocs.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 56ed581..43da301 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -11,5 +11,6 @@ mkdocs: python: install: - - extra_requirements: - - dev + - path: . + extra_requirements: + - dev From 0d63d8a9848bf60e84d909b84937f31b419ad4ef Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 12:58:02 +0200 Subject: [PATCH 10/10] small github ci improvements --- .github/workflows/python-package.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/python-package.yaml b/.github/workflows/python-package.yaml index 3a90ee3..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: @@ -25,9 +24,7 @@ jobs: 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 }}