Try pinning dynaconf to 3.1.x

No-Issue Signed-off-by: James Tanner <[email protected]>
ansible · Aug 11, 2023 · dd5115b · dd5115b
1 parent 0eac356
commit dd5115b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/profiles/base/Dockerfile b/profiles/base/Dockerfile
@@ -6,10 +6,10 @@ WORKDIR /opt/galaxy_ng/
 RUN switch_python 3.11
 
 # preinstall galaxy_ng in thebase image
-RUN pip3.11 install .
+RUN python3.11 -m pip install .
 
 # set up venv for integration tests 
-RUN pip3.11 install virtualenv && python3.11 -m venv /tmp/gng_testing
+RUN python3.11 -m pip install virtualenv && python3.11 -m venv /tmp/gng_testing
 RUN bash profiles/base/setup_venv.sh
 
 WORKDIR /
diff --git a/profiles/base/compose.yaml b/profiles/base/compose.yaml
@@ -22,5 +22,6 @@ services:
  localhost: "host-gateway"
  environment:
  - PULP_WORKERS=1
+ #- LOCK_REQUIREMENTS=0
  depends_on:
  - _galaxy_base
diff --git a/requirements/requirements.common.txt b/requirements/requirements.common.txt
@@ -321,7 +321,7 @@ pulp-container==2.15.1
  # via galaxy-ng (setup.py)
 pulp-glue==0.19.1
  # via pulpcore
-pulpcore @ git+https://github.com/pulp/pulpcore@3.28
+pulpcore==3.28.10
  # via
  # galaxy-ng (setup.py)
  # pulp-ansible

diff --git a/requirements/requirements.insights.txt b/requirements/requirements.insights.txt
@@ -332,7 +332,7 @@ pulp-container==2.15.1
  # via galaxy-ng (setup.py)
 pulp-glue==0.19.1
  # via pulpcore
-pulpcore @ git+https://github.com/pulp/pulpcore@3.28
+pulpcore==3.28.10
  # via
  # galaxy-ng (setup.py)
  # pulp-ansible

diff --git a/requirements/requirements.standalone.txt b/requirements/requirements.standalone.txt
@@ -321,7 +321,7 @@ pulp-container==2.15.1
  # via galaxy-ng (setup.py)
 pulp-glue==0.19.1
  # via pulpcore
-pulpcore @ git+https://github.com/pulp/pulpcore@3.28
+pulpcore==3.28.10
  # via
  # galaxy-ng (setup.py)
  # pulp-ansible

diff --git a/setup.py b/setup.py
@@ -112,15 +112,15 @@ def _format_pulp_requirement(plugin, specifier=None, ref=None, gh_namespace="pul
 
 requirements = [
  "galaxy-importer>=0.4.11,<0.5.0",
- # "pulpcore>=3.28.10,<3.40.0",
- "pulpcore @ git+https://github.com/pulp/[email protected]#egg=pulpcore",
+ "pulpcore>=3.28.10,<3.40.0",
+ # "pulpcore @ git+https://github.com/pulp/[email protected]#egg=pulpcore",
  "pulp_ansible>=0.19.0,<0.20.0",
  "django-prometheus>=2.0.0",
  "drf-spectacular",
  "pulp-container>=2.15.0,<2.17.0",
  "social-auth-core>=4.4.2",
  "social-auth-app-django>=5.2.0",
- "dynaconf>=3.1.12",
+ "dynaconf>=3.1.12,<3.1.13", 
  "django-auth-ldap==4.0.0",
  "insights_analytics_collector>=0.3.0",
  "boto3",