last try before skipping the test

galaxy_ng/tests/integration/package/test_package_install.py

@@ -30,12 +30,6 @@ def test_package_install(env_vars):
         pid = subprocess.run(f'python3.11 -m venv {basedir}/venv', shell=True)
         assert pid.returncode == 0
 
-        # upgrade pip
-        pid = subprocess.run(f'{basedir}/venv/bin/pip install --upgrade pip', shell=True)
-        assert pid.returncode == 0
-        pid = subprocess.run(f'{basedir}/venv/bin/pip install setuptools setuptools_scm wheel pyjwt requests', shell=True)
-        assert pid.returncode == 0
-
         # install the package
         cmd = f'{basedir}/venv/bin/pip install .'
         if env_vars:

setup.py

@@ -87,33 +87,11 @@ def run(self):
         return super().run()
 
 
-# FIXME: this currently works for CI and dev env, but pip-tools misses dependencies when
-# generating requirements.*.txt files. This needs to be fixed before use in the master branch.
-def _format_pulp_requirement(plugin, specifier=None, ref=None, gh_namespace="pulp"):
-    """
-    Formats the pulp plugin requirement.
-
-    The plugin template is VERY picky about the format we use for git refs. This will
-    help format git refs in a way that won't break CI when we need to pin to development
-    branches of pulp.
-
-    example:
-      _format_pulp_requirement("pulpcore", specifier=">=3.18.1,<3.19.0")
-      _format_pulp_requirement("pulpcore", ref="6e44fb2fe609f92dc1f502b19c67abd08879148f")
-    """
-    if specifier:
-        return plugin + specifier
-    else:
-        repo = plugin.replace("-", "_")
-        return (
-            f"{plugin}@git+https://[email protected]/" f"{gh_namespace}/{repo}.git@{ref}#egg={plugin}"
-        )
-
-
 django_ansible_base_branch = os.getenv('DJANGO_ANSIBLE_BASE_BRANCH', 'devel')
 django_ansible_base_dependency = (
     'django-ansible-base[jwt_consumer] @ '
-    f'git+https://github.com/ansible/django-ansible-base@{django_ansible_base_branch}'
+    'git+https://github.com/ansible/django-ansible-base@'
+    f'{django_ansible_base_branch}#egg=django-ansible-base'
 )
 
 requirements = [