Skip to content

Commit

Permalink
📦 Move plugin deps to constraints
Browse files Browse the repository at this point in the history
  • Loading branch information
webknjaz committed Nov 20, 2024
1 parent 3ba6e2e commit 7c0cfca
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 7 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,10 @@ requirements_awx: virtualenv_awx
if [[ "$(PIP_OPTIONS)" == *"--no-index"* ]]; then \
cat requirements/requirements.txt requirements/requirements_local.txt | $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) -r /dev/stdin ; \
else \
cat requirements/requirements.txt requirements/requirements_git.txt | $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --no-binary $(SRC_ONLY_PKGS) -r /dev/stdin ; \
$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --no-binary $(SRC_ONLY_PKGS) \
-r requirements/requirements.txt \
-r requirements/requirements_git.txt \
-c requirements/git-constraints.txt ; \
fi
$(VENV_BASE)/awx/bin/pip uninstall --yes -r requirements/requirements_tower_uninstall.txt

Expand Down
2 changes: 2 additions & 0 deletions requirements/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ aiohttp>=3.9.4 # CVE-2024-30251
ansi2html # Used to format the stdout from jobs into html for display
asciichartpy
asn1
awx-plugins-core
awx_plugins.interfaces
azure-identity
azure-keyvault
boto3
Expand Down
8 changes: 4 additions & 4 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ autocommand==2.2.2
# via jaraco-text
automat==22.10.0
# via twisted
# awx-plugins-core @ git+https://[email protected]/ansible/awx-plugins.git@devel # git requirements installed separately
# via -r /awx_devel/requirements/requirements_git.txt
awx-plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git
# via -r /awx_devel/requirements/requirements_git.txt
awx-plugins-core==0.0.1a7
# via -r /awx_devel/requirements/requirements.in
awx-plugins-interfaces==0.0.1a1
# via -r /awx_devel/requirements/requirements.in
azure-common==1.1.28
# via
# azure-keyvault-certificates
Expand Down
2 changes: 0 additions & 2 deletions requirements/requirements_git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ 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
django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel#egg=django-ansible-base[rest_filters,jwt_consumer,resource_registry,rbac]
awx-plugins-core @ git+https://[email protected]/ansible/awx-plugins.git@devel#egg=awx-plugins-core
awx_plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git
1 change: 1 addition & 0 deletions test-req/constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
awx-plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git
1 change: 1 addition & 0 deletions test-req/direct.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
awx-plugins.interfaces
1 change: 1 addition & 0 deletions tools/ansible/roles/dockerfile/templates/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ RUN mkdir /tmp/requirements
ADD requirements/requirements.txt \
requirements/requirements_tower_uninstall.txt \
requirements/requirements_git.txt \
requirements/git-constraints.txt \
/tmp/requirements/

RUN cd /tmp && make requirements_awx
Expand Down

0 comments on commit 7c0cfca

Please sign in to comment.