Revert "Pin versions for all optional dependencies" (#588)

This reverts commit 6d2bef8.
ansible · Aug 26, 2024 · d0b961f · d0b961f
1 parent 6d2bef8
commit d0b961f
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 226 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,28 +33,28 @@ dynamic = ["version", "dependencies", "optional-dependencies"]
 include = ["ansible_base*"]
 
 [tool.setuptools.dynamic]
-dependencies = {file = ["requirements/requirements.txt"]}
+dependencies = {file = ["requirements/requirements.in"]}
 optional-dependencies.all = { file = [
-    "requirements/requirements_activitystream.txt",
-    "requirements/requirements_authentication.txt",
-    "requirements/requirements_api_documentation.txt",
-    "requirements/requirements_rest_filters.txt",
-    "requirements/requirements_channels.txt",
-    "requirements/requirements_jwt_consumer.txt",
-    "requirements/requirements_testing.txt",
-    "requirements/requirements_redis_client.txt",
-    "requirements/requirements_oauth2_provider.txt",
+    "requirements/requirements_activitystream.in",
+    "requirements/requirements_authentication.in",
+    "requirements/requirements_api_documentation.in",
+    "requirements/requirements_rest_filters.in",
+    "requirements/requirements_channels.in",
+    "requirements/requirements_jwt_consumer.in",
+    "requirements/requirements_testing.in",
+    "requirements/requirements_redis_client.in",
+    "requirements/requirements_oauth2_provider.in",
 ] }
-optional-dependencies.activitystream = { file = [ "requirements/requirements_activitystream.txt" ] }
-optional-dependencies.authentication = { file = [ "requirements/requirements_authentication.txt" ] }
-optional-dependencies.api_documentation = { file = [ "requirements/requirements_api_documentation.txt" ] }
-optional-dependencies.rest_filters = { file = [ "requirements/requirements_rest_filters.txt" ] }
-optional-dependencies.rbac = { file = [ "requirements/requirements_rbac.txt" ] }
-optional-dependencies.channel_auth = { file = [ "requirements/requirements_channels.txt" ] }
-optional-dependencies.jwt_consumer = { file = [ "requirements/requirements_jwt_consumer.txt" ] }
-optional-dependencies.testing = { file = [ "requirements/requirements_testing.txt" ] }
-optional-dependencies.redis_client = { file = [ "requirements/requirements_redis_client.txt" ] }
-optional-dependencies.oauth2_provider = { file = [ "requirements/requirements_oauth2_provider.txt" ] }
+optional-dependencies.activitystream = { file = [ "requirements/requirements_activitystream.in" ] }
+optional-dependencies.authentication = { file = [ "requirements/requirements_authentication.in" ] }
+optional-dependencies.api_documentation = { file = [ "requirements/requirements_api_documentation.in" ] }
+optional-dependencies.rest_filters = { file = [ "requirements/requirements_rest_filters.in" ] }
+optional-dependencies.rbac = { file = [ "requirements/requirements_rbac.in" ] }
+optional-dependencies.channel_auth = { file = [ "requirements/requirements_channels.in" ] }
+optional-dependencies.jwt_consumer = { file = [ "requirements/requirements_jwt_consumer.in" ] }
+optional-dependencies.testing = { file = [ "requirements/requirements_testing.in" ] }
+optional-dependencies.redis_client = { file = [ "requirements/requirements_redis_client.in" ] }
+optional-dependencies.oauth2_provider = { file = [ "requirements/requirements_oauth2_provider.in" ] }
 
 [build-system]
 requires = ["setuptools>=64", "setuptools_scm>=8"]

diff --git a/requirements/requirements_activitystream.txt b/requirements/requirements_activitystream.txt
diff --git a/requirements/requirements_api_documentation.txt b/requirements/requirements_api_documentation.txt
diff --git a/requirements/requirements_authentication.txt b/requirements/requirements_authentication.txt
diff --git a/requirements/requirements_channels.txt b/requirements/requirements_channels.txt
diff --git a/requirements/requirements_jwt_consumer.txt b/requirements/requirements_jwt_consumer.txt
diff --git a/requirements/requirements_oauth2_provider.txt b/requirements/requirements_oauth2_provider.txt
diff --git a/requirements/requirements_rbac.txt b/requirements/requirements_rbac.txt
diff --git a/requirements/requirements_redis_client.txt b/requirements/requirements_redis_client.txt
diff --git a/requirements/requirements_rest_filters.txt b/requirements/requirements_rest_filters.txt
diff --git a/requirements/requirements_testing.txt b/requirements/requirements_testing.txt
diff --git a/requirements/updater.sh b/requirements/updater.sh
@@ -26,13 +26,7 @@ generate_requirements() {
 
   ${venv}/bin/python -m pip install -U 'pip' pip-tools
 
-  echo "generating requirements_all.txt"
   ${pip_compile} $(ls ${requirements_dir}/requirements*.in | xargs) --output-file requirements_all.txt
-  for OPTIONAL_DEP in $(ls ${requirements_dir}/requirements_*.in | xargs); do
-      OPTIONAL_DEP_TXT=$(echo $OPTIONAL_DEP | sed s':\.in:.txt:')
-      echo "generating $OPTIONAL_DEP_TXT"
-      ${pip_compile} ${OPTIONAL_DEP} --output-file ${OPTIONAL_DEP_TXT}
-  done
 }
 
 main() {