optimize dependencies

johndutchover · Feb 15, 2024 · 48fcea2 · 48fcea2
1 parent 840d4f1
commit 48fcea2
Show file tree

Hide file tree

Showing 5 changed files with 143 additions and 82 deletions.
diff --git a/app/Makefile b/app/Makefile
@@ -1,14 +1,19 @@
 update-deps:
 	pre-commit autoupdate
 	python -m pip install --upgrade pip-tools pip wheel
-	python -m piptools compile --upgrade -o requirements/requirements.txt pyproject.toml
-	python -m piptools compile --extra dev --upgrade -o requirements/requirements-dev.txt pyproject.toml
-
+	python -m piptools compile --upgrade -o requirements/requirements.txt requirements/requirements.in
+	python -m piptools compile --upgrade -o requirements/requirements-dev.txt requirements/requirements-dev.in
+	python -m pip install --upgrade --requirement=requirements/requirements.txt
+	python -m pip install --upgrade --requirement=requirements/requirements-dev.txt
 
 init:
 	rm -rf .tox
 	python -m pip install --upgrade pip wheel
-	python -m pip install --upgrade -r requirements/requirements.txt -r requirements/requirements-dev.txt -e .
+	python -m pip install --upgrade -r requirements/requirements.txt -e .
+	@python -m piptools compile -o requirements/requirements-dev.txt requirements/requirements-dev.in
+	@if [ -e requirements/requirements-dev.txt ]; then \
+		python -m pip install --upgrade --requirement=requirements/requirements-dev.txt; \
+	fi
 	python -m pip check
 
 update: update-deps init

diff --git a/app/pyproject.toml b/app/pyproject.toml
@@ -3,22 +3,19 @@ requires = ["setuptools", "setuptools-scm"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "app"
+name = "insight-ai-api"
+requires-python = ">=3.11"
 authors = [
   { name = "John Dutchover", email = "1983909-johndutchover@users.noreply.gitlab.com" },
 ]
 description = "API for insight-ai-api"
 readme = "README.md"
-requires-python = ">=3.11"
-dependencies = [
-  "fastapi",
-  "marvin",
-  'importlib-metadata; python_version<"3.12"',
-]
+
 dynamic = ["version"]
 
 [tool.setuptools.dynamic]
 dependencies = { file = ["requirements/requirements.in"] }
+optional-dependencies.test = { file = ["requirements/requirements-test.txt"] }
 
 [tool.pip-compile]
 generate-hashes = true
diff --git a/app/requirements/base.txt b/app/requirements/base.txt
diff --git a/app/requirements/requirements-dev.txt b/app/requirements/requirements-dev.txt
@@ -2,113 +2,199 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --extra=dev --output-file=requirements/requirements-dev.txt pyproject.toml
+#    pip-compile --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in
 #
 annotated-types==0.6.0
-    # via pydantic
+    # via
+    #   -r requirements/requirements.txt
+    #   pydantic
 anyio==4.2.0
     # via
+    #   -r requirements/requirements.txt
     #   httpx
     #   openai
     #   starlette
 cachetools==5.3.2
-    # via marvin
+    # via
+    #   -r requirements/requirements.txt
+    #   marvin
 certifi==2024.2.2
     # via
+    #   -r requirements/requirements.txt
     #   httpcore
     #   httpx
     #   requests
+cfgv==3.4.0
+    # via pre-commit
 charset-normalizer==3.3.2
-    # via requests
+    # via
+    #   -r requirements/requirements.txt
+    #   requests
 click==8.1.7
     # via
+    #   -r requirements/requirements.txt
     #   typer
     #   uvicorn
+conventional-pre-commit==3.1.0
+    # via -r requirements/requirements-dev.in
+distlib==0.3.8
+    # via virtualenv
 distro==1.9.0
-    # via openai
+    # via
+    #   -r requirements/requirements.txt
+    #   openai
 fastapi==0.109.2
     # via
-    #   app (pyproject.toml)
+    #   -r requirements/requirements.txt
     #   marvin
+filelock==3.13.1
+    # via virtualenv
 h11==0.14.0
     # via
+    #   -r requirements/requirements.txt
     #   httpcore
     #   uvicorn
-httpcore==1.0.2
-    # via httpx
+httpcore==1.0.3
+    # via
+    #   -r requirements/requirements.txt
+    #   httpx
 httpx==0.26.0
     # via
+    #   -r requirements/requirements-dev.in
+    #   -r requirements/requirements.txt
     #   marvin
     #   openai
+identify==2.5.34
+    # via pre-commit
 idna==3.6
     # via
+    #   -r requirements/requirements.txt
     #   anyio
     #   httpx
     #   requests
-importlib-metadata==7.0.1 ; python_version < "3.12"
-    # via app (pyproject.toml)
 jinja2==3.1.3
-    # via marvin
+    # via
+    #   -r requirements/requirements.txt
+    #   marvin
 jsonpatch==1.33
-    # via marvin
+    # via
+    #   -r requirements/requirements.txt
+    #   marvin
 jsonpointer==2.4
-    # via jsonpatch
+    # via
+    #   -r requirements/requirements.txt
+    #   jsonpatch
 markdown-it-py==3.0.0
-    # via rich
+    # via
+    #   -r requirements/requirements.txt
+    #   rich
 markupsafe==2.1.5
-    # via jinja2
-marvin==2.1.4
-    # via app (pyproject.toml)
+    # via
+    #   -r requirements/requirements.txt
+    #   jinja2
+marvin==2.1.5
+    # via -r requirements/requirements.txt
 mdurl==0.1.2
-    # via markdown-it-py
+    # via
+    #   -r requirements/requirements.txt
+    #   markdown-it-py
+nodeenv==1.8.0
+    # via pre-commit
 openai==1.12.0
-    # via marvin
+    # via
+    #   -r requirements/requirements.txt
+    #   marvin
+platformdirs==4.2.0
+    # via virtualenv
+pre-commit==3.6.1
+    # via -r requirements/requirements-dev.in
 pydantic==2.6.1
     # via
+    #   -r requirements/requirements.txt
     #   fastapi
     #   marvin
     #   openai
     #   pydantic-settings
 pydantic-core==2.16.2
-    # via pydantic
+    # via
+    #   -r requirements/requirements.txt
+    #   pydantic
 pydantic-settings==2.1.0
-    # via marvin
+    # via
+    #   -r requirements/requirements-dev.in
+    #   -r requirements/requirements.txt
+    #   marvin
 pygments==2.17.2
-    # via rich
+    # via
+    #   -r requirements/requirements.txt
+    #   rich
 python-dotenv==1.0.1
-    # via pydantic-settings
+    # via
+    #   -r requirements/requirements.txt
+    #   pydantic-settings
+pyyaml==6.0.1
+    # via pre-commit
 regex==2023.12.25
-    # via tiktoken
+    # via
+    #   -r requirements/requirements.txt
+    #   tiktoken
 requests==2.31.0
-    # via tiktoken
+    # via
+    #   -r requirements/requirements.txt
+    #   tiktoken
 rich==13.7.0
-    # via marvin
+    # via
+    #   -r requirements/requirements.txt
+    #   marvin
 sniffio==1.3.0
     # via
+    #   -r requirements/requirements.txt
     #   anyio
     #   httpx
     #   openai
 starlette==0.36.3
-    # via fastapi
+    # via
+    #   -r requirements/requirements.txt
+    #   fastapi
 tiktoken==0.6.0
-    # via marvin
-tqdm==4.66.1
-    # via openai
+    # via
+    #   -r requirements/requirements.txt
+    #   marvin
+tqdm==4.66.2
+    # via
+    #   -r requirements/requirements.txt
+    #   openai
 typer==0.9.0
-    # via marvin
+    # via
+    #   -r requirements/requirements.txt
+    #   marvin
+types-requests==2.31.0.20240125
+    # via -r requirements/requirements-dev.in
 typing-extensions==4.9.0
     # via
+    #   -r requirements/requirements.txt
     #   fastapi
     #   marvin
     #   openai
     #   pydantic
     #   pydantic-core
     #   typer
-tzdata==2023.4
-    # via marvin
+tzdata==2024.1
+    # via
+    #   -r requirements/requirements.txt
+    #   marvin
 urllib3==2.2.0
-    # via requests
+    # via
+    #   -r requirements/requirements.txt
+    #   requests
+    #   types-requests
 uvicorn==0.27.1
-    # via marvin
-zipp==3.17.0
-    # via importlib-metadata
+    # via
+    #   -r requirements/requirements-dev.in
+    #   -r requirements/requirements.txt
+    #   marvin
+virtualenv==20.25.0
+    # via pre-commit
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/app/requirements/requirements.txt b/app/requirements/requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --output-file=requirements/requirements.txt pyproject.toml
+#    pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
 #
 annotated-types==0.6.0
     # via pydantic
@@ -28,13 +28,13 @@ distro==1.9.0
     # via openai
 fastapi==0.109.2
     # via
-    #   app (pyproject.toml)
+    #   -r requirements/requirements.in
     #   marvin
 h11==0.14.0
     # via
     #   httpcore
     #   uvicorn
-httpcore==1.0.2
+httpcore==1.0.3
     # via httpx
 httpx==0.26.0
     # via
@@ -45,8 +45,6 @@ idna==3.6
     #   anyio
     #   httpx
     #   requests
-importlib-metadata==7.0.1 ; python_version < "3.12"
-    # via app (pyproject.toml)
 jinja2==3.1.3
     # via marvin
 jsonpatch==1.33
@@ -57,8 +55,8 @@ markdown-it-py==3.0.0
     # via rich
 markupsafe==2.1.5
     # via jinja2
-marvin==2.1.4
-    # via app (pyproject.toml)
+marvin==2.1.5
+    # via -r requirements/requirements.in
 mdurl==0.1.2
     # via markdown-it-py
 openai==1.12.0
@@ -92,7 +90,7 @@ starlette==0.36.3
     # via fastapi
 tiktoken==0.6.0
     # via marvin
-tqdm==4.66.1
+tqdm==4.66.2
     # via openai
 typer==0.9.0
     # via marvin
@@ -104,11 +102,9 @@ typing-extensions==4.9.0
     #   pydantic
     #   pydantic-core
     #   typer
-tzdata==2023.4
+tzdata==2024.1
     # via marvin
 urllib3==2.2.0
     # via requests
 uvicorn==0.27.1
     # via marvin
-zipp==3.17.0
-    # via importlib-metadata