Skip to content

Commit

Permalink
Pin pulp_ansible in setup.py and update deps in requirements (#571)
Browse files Browse the repository at this point in the history 
* Pin pulp_ansible to a z-stream release - Helps to ensure future updates to pulp_ansible will be pinned to a z-stream, otherwise when a new pulp_ansible z-stream releases, it will automatically get included in an on-prem automation-hub installation
* Update all deps in requirements files via pip-compile

No-Issue

(cherry picked from commit 734dd78)
  • Loading branch information
@awcrosby
awcrosby authored and Patchback committed Nov 19, 2020
1 parent f96c6d8 commit fdfb3a9
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 60 deletions.
22 changes: 10 additions & 12 deletions requirements/requirements.common.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ aiodns==2.0.0 # via pulpcore
aiofiles==0.5.0 # via pulpcore
aiohttp==3.6.2 # via pulpcore
ansible-base==2.10.1 # via ansible
ansible-builder==0.2.2 # via galaxy-importer
ansible-lint==4.3.5 # via galaxy-importer
ansible==2.10.0 # via ansible-lint, galaxy-importer
async-timeout==3.0.1 # via aiohttp
attrs==20.2.0 # via aiohttp, galaxy-importer, jsonschema
backoff==1.10.0 # via pulpcore
bleach-whitelist==0.0.11 # via galaxy-importer
bleach==3.2.1 # via galaxy-importer
certifi==2020.6.20 # via galaxy-ng (setup.py), requests
certifi==2020.6.20 # via requests
cffi==1.14.3 # via cryptography, pycares
chardet==3.0.4 # via aiohttp, requests
click==7.1.2 # via rq
colorama==0.4.3 # via rich
commonmark==0.9.1 # via rich
cryptography==3.1.1 # via ansible-base
dataclasses==0.7 # via rich
defusedxml==0.6.0 # via odfpy
diff-match-patch==20200713 # via django-import-export
django-cleanup==5.1.0 # via pulpcore
Expand All @@ -41,15 +41,14 @@ drf-spectacular==0.9.13 # via galaxy-ng (setup.py), pulpcore
dynaconf==3.1.1 # via pulpcore
et-xmlfile==1.0.1 # via openpyxl
flake8==3.8.3 # via galaxy-importer
galaxy-importer==0.2.11 # via pulp-ansible
galaxy-importer==0.2.11 # via galaxy-ng (setup.py), pulp-ansible
gunicorn==20.0.4 # via pulpcore
idna-ssl==1.1.0 # via aiohttp
idna==2.10 # via idna-ssl, requests, yarl
idna==2.10 # via requests, yarl
importlib-metadata==2.0.0 # via flake8, jsonschema, markdown
inflection==0.5.1 # via drf-spectacular
jdcal==1.4.1 # via openpyxl
jinja2==2.11.2 # via ansible-base, pulpcore
jsonschema==3.2.0 # via drf-spectacular
jsonschema==3.2.0 # via drf-spectacular, pulp-ansible
markdown==3.2.2 # via galaxy-importer
markuppy==1.14 # via tablib
markupsafe==1.1.1 # via jinja2
Expand All @@ -70,24 +69,23 @@ pygments==2.7.1 # via rich
pygtrie==2.3.3 # via pulpcore
pyparsing==2.4.7 # via packaging
pyrsistent==0.17.3 # via jsonschema
python-dateutil==2.8.1 # via galaxy-ng (setup.py)
python-gnupg==0.4.6 # via pulpcore
pytz==2020.1 # via django
pyyaml==5.3.1 # via ansible-base, ansible-lint, drf-spectacular, galaxy-importer, pulp-ansible, pulpcore, tablib
pyyaml==5.3.1 # via ansible-base, ansible-builder, ansible-lint, drf-spectacular, galaxy-importer, pulp-ansible, pulpcore, tablib
redis==3.5.3 # via pulpcore, rq
requests==2.24.0 # via galaxy-importer
requirements-parser==0.2.0 # via ansible-builder
rich==7.1.0 # via ansible-lint
rq==1.5.2 # via pulpcore
ruamel.yaml.clib==0.2.2 # via ruamel.yaml
ruamel.yaml==0.16.12 # via ansible-lint
semantic-version==2.8.5 # via galaxy-importer, pulp-ansible
six==1.15.0 # via bleach, cryptography, galaxy-ng (setup.py), jsonschema, packaging, python-dateutil
six==1.15.0 # via bleach, cryptography, jsonschema, packaging
sqlparse==0.3.1 # via django
tablib[html,ods,xls,xlsx,yaml]==2.0.0 # via django-import-export
typing-extensions==3.7.4.3 # via aiohttp, ansible-lint, rich, yarl
typing==3.7.4.3 # via aiodns
typing-extensions==3.7.4.3 # via ansible-lint, rich, yarl
uritemplate==3.0.1 # via drf-spectacular
urllib3==1.25.10 # via galaxy-ng (setup.py), requests
urllib3==1.25.10 # via requests
urlman==1.3.0 # via django-lifecycle
webencodings==0.5.1 # via bleach
whitenoise==5.2.0 # via pulpcore
Expand Down
23 changes: 11 additions & 12 deletions requirements/requirements.insights.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ aiodns==2.0.0 # via pulpcore
aiofiles==0.5.0 # via pulpcore
aiohttp==3.6.2 # via pulpcore
ansible-base==2.10.1 # via ansible
ansible-builder==0.2.2 # via galaxy-importer
ansible-lint==4.3.5 # via galaxy-importer
ansible==2.10.0 # via ansible-lint, galaxy-importer
async-timeout==3.0.1 # via aiohttp
Expand All @@ -17,14 +18,13 @@ bleach-whitelist==0.0.11 # via galaxy-importer
bleach==3.2.1 # via galaxy-importer
boto3==1.15.9 # via -r requirements/requirements.insights.in, django-storages, watchtower
botocore==1.18.9 # via boto3, s3transfer
certifi==2020.6.20 # via galaxy-ng (setup.py), requests
certifi==2020.6.20 # via requests
cffi==1.14.3 # via cryptography, pycares
chardet==3.0.4 # via aiohttp, requests
click==7.1.2 # via rq
colorama==0.4.3 # via rich
commonmark==0.9.1 # via rich
cryptography==3.1.1 # via ansible-base
dataclasses==0.7 # via rich
defusedxml==0.6.0 # via odfpy
diff-match-patch==20200713 # via django-import-export
django-cleanup==5.1.0 # via pulpcore
Expand All @@ -44,16 +44,15 @@ drf-spectacular==0.9.13 # via galaxy-ng (setup.py), pulpcore
dynaconf==3.1.1 # via pulpcore
et-xmlfile==1.0.1 # via openpyxl
flake8==3.8.3 # via galaxy-importer
galaxy-importer==0.2.11 # via pulp-ansible
galaxy-importer==0.2.11 # via galaxy-ng (setup.py), pulp-ansible
gunicorn==20.0.4 # via pulpcore
idna-ssl==1.1.0 # via aiohttp
idna==2.10 # via idna-ssl, requests, yarl
idna==2.10 # via requests, yarl
importlib-metadata==2.0.0 # via flake8, jsonschema, markdown
inflection==0.5.1 # via drf-spectacular
jdcal==1.4.1 # via openpyxl
jinja2==2.11.2 # via ansible-base, pulpcore
jmespath==0.10.0 # via boto3, botocore
jsonschema==3.2.0 # via drf-spectacular
jsonschema==3.2.0 # via drf-spectacular, pulp-ansible
logstash-formatter==0.5.17 # via -r requirements/requirements.insights.in
markdown==3.2.2 # via galaxy-importer
markuppy==1.14 # via tablib
Expand All @@ -75,25 +74,25 @@ pygments==2.7.1 # via rich
pygtrie==2.3.3 # via pulpcore
pyparsing==2.4.7 # via packaging
pyrsistent==0.17.3 # via jsonschema
python-dateutil==2.8.1 # via botocore, galaxy-ng (setup.py)
python-dateutil==2.8.1 # via botocore
python-gnupg==0.4.6 # via pulpcore
pytz==2020.1 # via django
pyyaml==5.3.1 # via ansible-base, ansible-lint, drf-spectacular, galaxy-importer, pulp-ansible, pulpcore, tablib
pyyaml==5.3.1 # via ansible-base, ansible-builder, ansible-lint, drf-spectacular, galaxy-importer, pulp-ansible, pulpcore, tablib
redis==3.5.3 # via pulpcore, rq
requests==2.24.0 # via galaxy-importer
requirements-parser==0.2.0 # via ansible-builder
rich==7.1.0 # via ansible-lint
rq==1.5.2 # via pulpcore
ruamel.yaml.clib==0.2.2 # via ruamel.yaml
ruamel.yaml==0.16.12 # via ansible-lint
s3transfer==0.3.3 # via boto3
semantic-version==2.8.5 # via galaxy-importer, pulp-ansible
six==1.15.0 # via bleach, cryptography, galaxy-ng (setup.py), jsonschema, packaging, python-dateutil
six==1.15.0 # via bleach, cryptography, jsonschema, packaging, python-dateutil
sqlparse==0.3.1 # via django
tablib[html,ods,xls,xlsx,yaml]==2.0.0 # via django-import-export
typing-extensions==3.7.4.3 # via aiohttp, ansible-lint, rich, yarl
typing==3.7.4.3 # via aiodns
typing-extensions==3.7.4.3 # via ansible-lint, rich, yarl
uritemplate==3.0.1 # via drf-spectacular
urllib3==1.25.10 # via botocore, galaxy-ng (setup.py), requests
urllib3==1.25.10 # via botocore, requests
urlman==1.3.0 # via django-lifecycle
watchtower==0.8.0 # via -r requirements/requirements.insights.in
webencodings==0.5.1 # via bleach
Expand Down
22 changes: 10 additions & 12 deletions requirements/requirements.standalone.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ aiodns==2.0.0 # via pulpcore
aiofiles==0.5.0 # via pulpcore
aiohttp==3.6.2 # via pulpcore
ansible-base==2.10.1 # via ansible
ansible-builder==0.2.2 # via galaxy-importer
ansible-lint==4.3.5 # via galaxy-importer
ansible==2.10.0 # via ansible-lint, galaxy-importer
async-timeout==3.0.1 # via aiohttp
attrs==20.2.0 # via aiohttp, galaxy-importer, jsonschema
backoff==1.10.0 # via pulpcore
bleach-whitelist==0.0.11 # via galaxy-importer
bleach==3.2.1 # via galaxy-importer
certifi==2020.6.20 # via galaxy-ng (setup.py), requests
certifi==2020.6.20 # via requests
cffi==1.14.3 # via cryptography, pycares
chardet==3.0.4 # via aiohttp, requests
click==7.1.2 # via rq
colorama==0.4.3 # via rich
commonmark==0.9.1 # via rich
cryptography==3.1.1 # via ansible-base, pyjwt
dataclasses==0.7 # via rich
defusedxml==0.6.0 # via odfpy
diff-match-patch==20200713 # via django-import-export
django-cleanup==5.1.0 # via pulpcore
Expand All @@ -43,15 +43,14 @@ ecdsa==0.13.3 # via pulp-container
et-xmlfile==1.0.1 # via openpyxl
flake8==3.8.3 # via galaxy-importer
future==0.18.2 # via pyjwkest
galaxy-importer==0.2.11 # via pulp-ansible
galaxy-importer==0.2.11 # via galaxy-ng (setup.py), pulp-ansible
gunicorn==20.0.4 # via pulpcore
idna-ssl==1.1.0 # via aiohttp
idna==2.10 # via idna-ssl, requests, yarl
idna==2.10 # via requests, yarl
importlib-metadata==2.0.0 # via flake8, jsonschema, markdown
inflection==0.5.1 # via drf-spectacular
jdcal==1.4.1 # via openpyxl
jinja2==2.11.2 # via ansible-base, pulpcore
jsonschema==3.2.0 # via drf-spectacular
jsonschema==3.2.0 # via drf-spectacular, pulp-ansible
markdown==3.2.2 # via galaxy-importer
markuppy==1.14 # via tablib
markupsafe==1.1.1 # via jinja2
Expand All @@ -76,25 +75,24 @@ pyjwkest==1.4.2 # via pulp-container
pyjwt[crypto]==1.7.1 # via pulp-container
pyparsing==2.4.7 # via packaging
pyrsistent==0.17.3 # via jsonschema
python-dateutil==2.8.1 # via galaxy-ng (setup.py)
python-gnupg==0.4.6 # via pulpcore
pytz==2020.1 # via django
pyyaml==5.3.1 # via ansible-base, ansible-lint, drf-spectacular, galaxy-importer, pulp-ansible, pulpcore, tablib
pyyaml==5.3.1 # via ansible-base, ansible-builder, ansible-lint, drf-spectacular, galaxy-importer, pulp-ansible, pulpcore, tablib
redis==3.5.3 # via pulpcore, rq
requests==2.24.0 # via galaxy-importer, pyjwkest
requirements-parser==0.2.0 # via ansible-builder
rich==7.1.0 # via ansible-lint
rq==1.5.2 # via pulpcore
ruamel.yaml.clib==0.2.2 # via ruamel.yaml
ruamel.yaml==0.16.12 # via ansible-lint
semantic-version==2.8.5 # via galaxy-importer, pulp-ansible
six==1.15.0 # via bleach, cryptography, galaxy-ng (setup.py), jsonschema, packaging, pyjwkest, python-dateutil, url-normalize
six==1.15.0 # via bleach, cryptography, jsonschema, packaging, pyjwkest, url-normalize
sqlparse==0.3.1 # via django
tablib[html,ods,xls,xlsx,yaml]==2.0.0 # via django-import-export
typing-extensions==3.7.4.3 # via aiohttp, ansible-lint, rich, yarl
typing==3.7.4.3 # via aiodns
typing-extensions==3.7.4.3 # via ansible-lint, rich, yarl
uritemplate==3.0.1 # via drf-spectacular
url-normalize==1.4.2 # via pulp-container
urllib3==1.25.10 # via galaxy-ng (setup.py), requests
urllib3==1.25.10 # via requests
urlman==1.3.0 # via django-lifecycle
webencodings==0.5.1 # via bleach
whitenoise==5.2.0 # via pulpcore
Expand Down
44 changes: 21 additions & 23 deletions requirements/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,44 @@
aiodns==2.0.0 # via pulpcore
aiofiles==0.5.0 # via pulpcore
aiohttp==3.6.2 # via pulpcore
ansible-builder==0.2.2 # via galaxy-importer
ansible-lint==4.2.0 # via galaxy-importer
ansible==2.9.9 # via ansible-lint, galaxy-importer
async-timeout==3.0.1 # via aiohttp
attrs==19.3.0 # via aiohttp, galaxy-importer, jsonschema
backoff==1.10.0 # via pulpcore
bleach-whitelist==0.0.10 # via galaxy-importer
bleach==3.1.5 # via galaxy-importer
certifi==2020.4.5.1 # via galaxy-ng (setup.py), requests
certifi==2020.4.5.1 # via requests
cffi==1.14.0 # via cryptography, pycares
chardet==3.0.4 # via aiohttp, requests
click==7.1.2 # via dynaconf, rq
click==7.1.2 # via rq
cryptography==2.9.2 # via ansible
defusedxml==0.6.0 # via odfpy
diff-match-patch==20181111 # via django-import-export
django-currentuser==0.5.1 # via pulpcore
django-filter==2.3.0 # via pulpcore
django-filter==2.4.0 # via pulpcore
django-guardian==2.3.0 # via pulpcore
django-import-export==2.3.0 # via pulpcore
django-lifecycle==0.7.7 # via pulpcore
django-import-export==2.4.0 # via pulpcore
django-lifecycle==0.8.0 # via pulpcore
django-prometheus==2.0.0 # via galaxy-ng (setup.py)
django==2.2.16 # via django-currentuser, django-filter, django-guardian, django-import-export, django-lifecycle, drf-nested-routers, drf-spectacular, galaxy-ng (setup.py), pulpcore
django==2.2.16 # via django-currentuser, django-filter, django-guardian, django-import-export, django-lifecycle, djangorestframework, drf-nested-routers, drf-spectacular, galaxy-ng (setup.py), pulpcore
djangorestframework-queryfields==1.0.0 # via pulpcore
djangorestframework==3.10.3 # via drf-nested-routers, drf-spectacular, pulpcore
drf-access-policy==0.6.2 # via pulpcore
drf-nested-routers==0.91 # via pulpcore
drf-spectacular==0.9.12 # via galaxy-ng (setup.py), pulpcore
dynaconf==2.2.3 # via pulpcore
djangorestframework==3.12.2 # via drf-nested-routers, drf-spectacular, pulpcore
drf-access-policy==0.8.1 # via pulpcore
drf-nested-routers==0.92.1 # via pulpcore
drf-spectacular==0.9.14 # via galaxy-ng (setup.py), pulpcore
dynaconf==3.1.2 # via pulpcore
et-xmlfile==1.0.1 # via openpyxl
flake8==3.8.2 # via galaxy-importer
galaxy-importer==0.2.8rc11 # via pulp-ansible
galaxy-importer==0.2.11 # via galaxy-ng (setup.py), pulp-ansible
gunicorn==20.0.4 # via pulpcore
idna==2.9 # via requests, yarl
importlib-metadata==1.6.0 # via flake8, jsonschema, markdown
inflection==0.4.0 # via drf-spectacular
jdcal==1.4.1 # via openpyxl
jinja2==2.11.2 # via ansible
jsonschema==3.2.0 # via drf-spectacular
jinja2==2.11.2 # via ansible, pulpcore
jsonschema==3.2.0 # via drf-spectacular, pulp-ansible
markdown==3.2.2 # via galaxy-importer
markuppy==1.14 # via tablib
markupsafe==1.1.1 # via jinja2
Expand All @@ -54,33 +55,30 @@ openpyxl==3.0.3 # via tablib
packaging==20.4 # via bleach, pulp-ansible
prometheus-client==0.8.0 # via django-prometheus
psycopg2==2.8.5 # via pulpcore
pulp-ansible==0.3.0 # via galaxy-ng (setup.py)
pulpcore==3.6.1 # via galaxy-ng (setup.py), pulp-ansible
pulp-ansible==0.5.0 # via galaxy-ng (setup.py)
pulpcore==3.8.1 # via galaxy-ng (setup.py), pulp-ansible
pycares==3.1.1 # via aiodns
pycodestyle==2.6.0 # via flake8
pycparser==2.20 # via cffi
pyflakes==2.2.0 # via flake8
pygtrie==2.3.3 # via pulpcore
pyparsing==2.4.7 # via packaging
pyrsistent==0.16.0 # via jsonschema
python-box==3.4.6 # via dynaconf
python-dateutil==2.8.1 # via galaxy-ng (setup.py)
python-dotenv==0.13.0 # via dynaconf
python-gnupg==0.4.6 # via pulpcore
pytz==2020.1 # via django
pyyaml==5.3.1 # via ansible, ansible-lint, drf-spectacular, galaxy-importer, pulp-ansible, pulpcore, tablib
pyyaml==5.3.1 # via ansible, ansible-builder, ansible-lint, drf-spectacular, galaxy-importer, pulp-ansible, pulpcore, tablib
redis==3.5.3 # via pulpcore, rq
requests==2.23.0 # via galaxy-importer
requirements-parser==0.2.0 # via ansible-builder
rq==1.4.2 # via pulpcore
ruamel.yaml.clib==0.2.0 # via ruamel.yaml
ruamel.yaml==0.16.10 # via ansible-lint
semantic-version==2.8.5 # via galaxy-importer, pulp-ansible
six==1.15.0 # via ansible-lint, bleach, cryptography, galaxy-ng (setup.py), jsonschema, packaging, pyrsistent, python-dateutil
six==1.15.0 # via ansible-lint, bleach, cryptography, jsonschema, packaging, pyrsistent
sqlparse==0.3.1 # via django
tablib[html,ods,xls,xlsx,yaml]==2.0.0 # via django-import-export
toml==0.10.1 # via dynaconf
uritemplate==3.0.1 # via drf-spectacular
urllib3==1.25.9 # via galaxy-ng (setup.py), requests
urllib3==1.25.9 # via requests
urlman==1.3.0 # via django-lifecycle
webencodings==0.5.1 # via bleach
whitenoise==5.1.0 # via pulpcore
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def run(self):
"Django~=2.2.3",
"galaxy-importer==0.2.11",
"pulpcore>=3.7,<3.9",
"pulp-ansible~=0.5.0",
"pulp-ansible==0.5.0",
"django-prometheus>=2.0.0",
"drf-spectacular",
]
Expand Down

0 comments on commit fdfb3a9

Please sign in to comment.