Skip to content

Commit dc707a9

Browse files
Merge pull request #1816 from VWS-Python/rm-setup-py
Remove setup.py and requirements files in favour of pyproject.toml
2 parents 21e6a61 + de2ed6c commit dc707a9

File tree

10 files changed

+52
-82
lines changed

10 files changed

+52
-82
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22
updates:
33
- package-ecosystem: pip
4-
directory: "/requirements"
4+
directory: "/"
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 10

.github/workflows/ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ jobs:
3232
- uses: actions/cache@v3
3333
with:
3434
path: ~/.cache/pip
35-
# This is like the example but we use ``*requirements.txt`` rather
36-
# than ``requirements.txt`` because we have multiple requirements
37-
# files.
38-
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt') }}
35+
key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
3936
restore-keys: |
4037
${{ runner.os }}-pip-
4138

.github/workflows/windows-ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ jobs:
3232
- uses: actions/cache@v3
3333
with:
3434
path: ~\AppData\Local\pip\Cache
35-
# This is like the example but we use ``*requirements.txt`` rather
36-
# than ``requirements.txt`` because we have multiple requirements
37-
# files.
38-
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt') }}
35+
key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
3936
restore-keys: |
4037
${{ runner.os }}-pip-
4138

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
include src/vws/py.typed
2-
include requirements/*.txt
32
include pyproject.toml

lint.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ fix-ruff:
3232

3333
.PHONY: pip-extra-reqs
3434
pip-extra-reqs:
35-
pip-extra-reqs --requirements-file=requirements/requirements.txt src/
35+
pdm export --pyproject | pip-extra-reqs --requirements-file=/dev/fd/0 src/
3636

3737
.PHONY: pip-missing-reqs
3838
pip-missing-reqs:
39-
pip-missing-reqs --requirements-file=requirements/requirements.txt src/
39+
pdm export --pyproject | pip-missing-reqs --requirements-file=/dev/fd/0 src/
4040

4141
.PHONY: pylint
4242
pylint:
43-
pylint *.py src/ tests/ docs/
43+
pylint src/ tests/ docs/
4444

4545
.PHONY: pyroma
4646
pyroma:

pyproject.toml

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,13 @@ module = [
148148
ignore_missing_imports = true
149149

150150
[build-system]
151-
requires = ["setuptools", "pip", "wheel"]
151+
requires = [
152+
"pip",
153+
"setuptools",
154+
"setuptools-scm-git-archive==1.4",
155+
"setuptools_scm[toml]==7.1.0",
156+
"wheel",
157+
]
152158
build-backend = "setuptools.build_meta"
153159

154160
[tool.distutils.bdist_wheel]
@@ -214,6 +220,45 @@ license = { file = "LICENSE" }
214220
name = "vws-python"
215221
readme = { file = "README.rst", content-type = "text/x-rst"}
216222
requires-python = ">=3.10"
223+
dependencies = [
224+
"VWS-Auth-Tools",
225+
"func-timeout",
226+
"requests",
227+
"urllib3",
228+
]
229+
230+
[project.optional-dependencies]
231+
dev = [
232+
"PyYAML==6.0",
233+
"Pygments==2.14.0",
234+
"Sphinx-Substitution-Extensions==2022.2.16",
235+
"Sphinx==6.1.3",
236+
"VWS-Python-Mock==2023.3.5",
237+
"VWS-Test-Fixtures==2023.3.5",
238+
"black==23.1.0",
239+
"check-manifest==0.49",
240+
"doc8==1.1.1",
241+
"dodgy==0.2.1",
242+
"freezegun==1.2.2",
243+
"furo==2022.12.7",
244+
"mypy==1.1.1",
245+
"pdm==2.4.8",
246+
"pip_check_reqs==2.4.4",
247+
"pydocstyle==6.3.0 ",
248+
"pyenchant==3.2.2 ",
249+
"pylint==2.17.0 ",
250+
"pyroma==4.2",
251+
"pytest-cov==4.0.0",
252+
"pytest==7.2.2 ",
253+
"ruff==0.0.254",
254+
"sphinx-autodoc-typehints==1.22",
255+
"sphinx-prompt==1.5.0",
256+
"sphinxcontrib-spelling==8.0.0",
257+
"types-freezegun==1.1.10",
258+
"types-requests==2.28.11.15",
259+
"types-setuptools==67.6.0.0",
260+
"vulture==2.7",
261+
]
217262

218263
[project.urls]
219264
Source = "https://github.com/VWS-Python/vws-python"

requirements/dev-requirements.txt

Lines changed: 0 additions & 28 deletions
This file was deleted.

requirements/requirements.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

requirements/setup-requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

setup.py

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)