Move requirements to pyproject.toml

adamtheturtle · adamtheturtle · commit 0a76b4ca9ebb · 2023-03-10T18:10:56.000Z
diff --git a/pyproject.toml b/pyproject.toml
@@ -214,6 +214,12 @@ license = { file = "LICENSE" }
 name = "vws-python"
 readme = { file = "README.rst", content-type = "text/x-rst"}
 requires-python = ">=3.10"
+dependencies = [
+    "VWS-Auth-Tools",
+    "func-timeout",
+    "requests",
+    "urllib3",
+]
 
 [project.urls]
 Source = "https://github.com/VWS-Python/vws-python"
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,4 +0,0 @@
-VWS-Auth-Tools
-func-timeout
-requests
-urllib3
diff --git a/setup.py b/setup.py
@@ -15,10 +15,6 @@ def _get_dependencies(requirements_file: Path) -> list[str]:
     return [line for line in lines if not line.startswith("#")]
 
 
-INSTALL_REQUIRES = _get_dependencies(
-    requirements_file=Path("requirements/requirements.txt"),
-)
-
 DEV_REQUIRES = _get_dependencies(
     requirements_file=Path("requirements/dev-requirements.txt"),
 )
@@ -29,6 +25,5 @@ def _get_dependencies(requirements_file: Path) -> list[str]:
 
 setup(
     setup_requires=SETUP_REQUIRES,
-    install_requires=INSTALL_REQUIRES,
     extras_require={"dev": DEV_REQUIRES},
 )

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,6 @@ def _get_dependencies(requirements_file: Path) -> list[str]:`
`15`	`15`	`return [line for line in lines if not line.startswith("#")]`
`16`	`16`
`17`	`17`
`18`		`-INSTALL_REQUIRES = _get_dependencies(`
`19`		`- requirements_file=Path("requirements/requirements.txt"),`
`20`		`-)`
`21`		`-`
`22`	`18`	`DEV_REQUIRES = _get_dependencies(`
`23`	`19`	`requirements_file=Path("requirements/dev-requirements.txt"),`
`24`	`20`	`)`
`@@ -29,6 +25,5 @@ def _get_dependencies(requirements_file: Path) -> list[str]:`
`29`	`25`
`30`	`26`	`setup(`
`31`	`27`	`setup_requires=SETUP_REQUIRES,`
`32`		`- install_requires=INSTALL_REQUIRES,`
`33`	`28`	`extras_require={"dev": DEV_REQUIRES},`
`34`	`29`	`)`