From 38f0f8d45fc19a2476e1613a18aed98e932ac8ae Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Wed, 9 Apr 2025 17:20:12 -0400 Subject: [PATCH] Remove pbr dependency (#15806) * Remove pbr dependency * Review comment, remove comment --- requirements/requirements.in | 3 --- requirements/requirements.txt | 2 -- requirements/requirements_git.txt | 1 - 3 files changed, 6 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index c2e2b8d6e0..4e2e9eb6d2 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -69,6 +69,3 @@ setuptools_scm[toml] # see UPGRADE BLOCKERs, xmlsec build dep setuptools-rust>=0.11.4 # cryptography build dep pkgconfig>=1.5.1 # xmlsec build dep - needed for offline build django-flags>=5.0.13 -# Temporarily added to use ansible-runner from git branch, to be removed -# when ansible-runner moves from requirements_git.txt to here -pbr diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 6cb67b3280..2a405932f4 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -336,8 +336,6 @@ packaging==24.2 # ansible-runner # opentelemetry-instrumentation # setuptools-scm -pbr==6.1.0 - # via -r /awx_devel/requirements/requirements.in pexpect==4.7.0 # via # -r /awx_devel/requirements/requirements.in diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index c9bd7cb33f..51a0f4f697 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -1,5 +1,4 @@ git+https://github.com/ansible/system-certifi.git@devel#egg=certifi -# Remove pbr from requirements.in when moving ansible-runner to requirements.in git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner awx-plugins-core @ git+https://github.com/ansible/awx-plugins.git@devel#egg=awx-plugins-core[credentials-github-app] django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel#egg=django-ansible-base[rest-filters,jwt_consumer,resource-registry,rbac,feature-flags]