Merge pull request #5791 from hotosm/dependency/sync-pyprojet.toml

Fix dependency mismatch between `requirements.txt` and `pyproject.toml`
hotosm · May 16, 2023 · dd65104 · dd65104
2 parents 2a9ad10 + a996154
commit dd65104
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 27 deletions.
diff --git a/migrations/env.py b/migrations/env.py
@@ -90,7 +90,7 @@ def process_revision_directives(context, revision, directives):
         target_metadata=target_metadata,
         process_revision_directives=process_revision_directives,
         include_object=include_object,
-        **current_app.extensions["migrate"].configure_args
+        **current_app.extensions["migrate"].configure_args,
     )
 
     try:

diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,14 +11,14 @@ dependencies = [
     "appdirs==1.4.4",
     "APScheduler==3.7.0",
     "attrs==20.2.0",
-    "black==20.8b1",
+    "black==23.3.0",
     "bleach==5.0.1",
     "blinker==1.5",
     "cachetools==4.1.1",
     "certifi==2020.6.20",
     "chardet==3.0.4",
     "charset-normalizer==2.0.12",
-    "click==7.1.2",
+    "click==8.1.3",
     "coverage==6.4",
     "entrypoints==0.3",
     "flake8==3.8.4",
@@ -49,7 +49,9 @@ dependencies = [
     "newrelic==8.8.0",
     "nose==1.3.7",
     "oauthlib==3.2.0",
+    "packaging==23.1",
     "pathspec==0.11.1",
+    "platformdirs==3.5.0",
     "psycopg2==2.8.6",
     "pycodestyle==2.6.0",
     "pyflakes==2.2.0",
@@ -66,11 +68,13 @@ dependencies = [
     "requests-oauthlib==1.3.1",
     "schematics==2.1.1",
     "sentry-sdk[flask]==1.5.8",
+    "setuptools==67.7.2",
     "Shapely==1.7.1",
     "six==1.15.0",
     "SQLAlchemy==1.3.20",
     "text-unidecode==1.3",
     "toml==0.10.1",
+    "tomli==2.0.1",
     "typed-ast==1.5.4",
     "typing-extensions==4.5.0",
     "tzlocal==2.1",
@@ -79,8 +83,8 @@ dependencies = [
     "webencodings==0.5.1",
     "Werkzeug==0.16.1",
     "zipp==3.15.0",
-    "zope.event==4.6",
-    "zope.interface==6.0",
+    "zope-event==4.6",
+    "zope-interface==6.0",
 ]
 requires-python = ">=3.9,<=3.11"
 readme = "README.md"

diff --git a/requirements.txt b/requirements.txt
@@ -48,7 +48,7 @@ psycopg2==2.8.6
 pycodestyle==2.6.0
 pyflakes==2.2.0
 pyparsing==2.4.7
-pyproj==2.6.1.post1
+pyproj==3.5.0
 python-dateutil==2.8.1
 python-dotenv==0.14.0
 python-editor==1.0.4
@@ -58,21 +58,23 @@ PyYAML==5.4
 regex==2022.10.31
 requests==2.27.1
 requests-oauthlib==1.3.1
-schematics==2.1.0
+schematics==2.1.1
 sentry-sdk[flask]==1.5.8
+setuptools==67.7.2
 Shapely==1.7.1
 six==1.15.0
 SQLAlchemy==1.3.20
 text-unidecode==1.3
 toml==0.10.1
 tomli==2.0.1
 typed-ast==1.5.4
-typing_extensions==4.5.0
+typing-extensions==4.5.0
 tzlocal==2.1
 Unidecode==1.1.1
 urllib3==1.26.9
 webencodings==0.5.1
 Werkzeug==0.16.1
 zipp==3.15.0
-zope.event==4.6
-zope.interface==6.0
+zope-event==4.6
+zope-interface==6.0
+
diff --git a/tests/backend/integration/services/test_mapping_service.py b/tests/backend/integration/services/test_mapping_service.py
@@ -9,6 +9,7 @@
 
 ORG_NAME = "HOT Tasking Manager"
 
+
 class TestMappingService(BaseTestCase):
     skip_tests = False
     test_project = None