From b8392b343e06b3db6d4642c4794718ed7bf16651 Mon Sep 17 00:00:00 2001 From: Jake Jackson Date: Mon, 28 Jun 2021 14:18:49 -0400 Subject: [PATCH 1/3] update namespace assignees remove anshul from the assignees list for new namespaces --- .github/ISSUE_TEMPLATE/New_namespace.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/New_namespace.md b/.github/ISSUE_TEMPLATE/New_namespace.md index f644e751d..65d0ca5db 100644 --- a/.github/ISSUE_TEMPLATE/New_namespace.md +++ b/.github/ISSUE_TEMPLATE/New_namespace.md @@ -3,7 +3,7 @@ name: Request a Namespace about: Request a new namespace for one of your GitHub Orgs title: 'namespace: FIXME' labels: area/namespace -assignees: anshulbehl, JohnLieske, thedoubl3j +assignees: JohnLieske, thedoubl3j --- From 07177750750099754a65f50951b93a10e2a1c6d1 Mon Sep 17 00:00:00 2001 From: Andrew Crosby Date: Tue, 7 Sep 2021 10:47:02 -0400 Subject: [PATCH 2/3] Upgrade to galaxy-importer 0.4.0 and update deps (#2780) Ran `make dev/compile-reqs` Issue: AAH-904 --- requirements/dev-requirements.txt | 110 +++++++++++++++++------------- requirements/requirements.in | 2 +- requirements/requirements.txt | 30 ++++---- 3 files changed, 79 insertions(+), 63 deletions(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index b2336b275..445212ad4 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/dev-requirements.txt requirements/dev-requirements.in @@ -10,11 +10,13 @@ alabaster==0.7.12 # via sphinx amqp==1.4.9 # via kombu -ansible-lint==5.0.3 +ansible-builder==1.0.1 + # via galaxy-importer +ansible-core==2.11.4 # via # -r requirements/requirements.in # galaxy-importer -ansible==2.9.7 +ansible-lint==5.1.3 # via # -r requirements/requirements.in # galaxy-importer @@ -22,7 +24,7 @@ anyjson==0.3.3 # via kombu async-timeout==3.0.1 # via aiohttp -attrs==19.3.0 +attrs==21.2.0 # via # aiohttp # galaxy-importer @@ -31,10 +33,12 @@ babel==2.6.0 # via sphinx billiard==3.3.0.23 # via celery -bleach-allowlist==1.0.3 - # via galaxy-importer +bindep==2.9.0 + # via ansible-builder bleach==3.3.0 # via galaxy-importer +bleach-allowlist==1.0.3 + # via galaxy-importer boto3==1.9.107 # via django-storages botocore==1.12.107 @@ -52,9 +56,9 @@ certifi==2018.11.29 cffi==1.14.5 # via cryptography chardet==3.0.4 - # via - # aiohttp - # requests + # via aiohttp +charset-normalizer==2.0.4 + # via requests click==7.0 # via # dynaconf @@ -75,15 +79,30 @@ coverage==4.5.2 # via pytest-cov cryptography==3.4.6 # via - # ansible + # ansible-core # pyjwt # pyopenssl defusedxml==0.5.0 # via python3-openid deprecated==1.2.4 # via pygithub +distro==1.6.0 + # via bindep dj-database-url==0.5.0 # via -r requirements/requirements.in +django==2.2.19 + # via + # -r requirements/requirements.in + # django-allauth + # django-bootstrap-form + # django-celery + # django-debug-toolbar + # django-filter + # django-log-request-id + # django-storages + # drf-nested-routers + # drf-yasg + # pulpcore django-allauth==0.43.0 # via -r requirements/requirements.in django-bootstrap-form==3.4 @@ -102,27 +121,14 @@ django-prometheus==1.0.15 # via -r requirements/requirements.in django-storages[boto3]==1.7.1 # via -r requirements/requirements.in -django==2.2.19 +djangorestframework==3.7.7 # via # -r requirements/requirements.in - # django-allauth - # django-bootstrap-form - # django-celery - # django-debug-toolbar - # django-filter - # django-log-request-id - # django-storages # drf-nested-routers # drf-yasg # pulpcore djangorestframework-queryfields==1.0.0 # via pulpcore -djangorestframework==3.7.7 - # via - # -r requirements/requirements.in - # drf-nested-routers - # drf-yasg - # pulpcore docutils==0.14 # via # botocore @@ -136,13 +142,11 @@ dynaconf==1.2.0 # via pulpcore enrich==1.2.6 # via ansible-lint -entrypoints==0.3 - # via flake8 -flake8==3.7.9 +flake8==3.9.2 # via # -r requirements/requirements.in # galaxy-importer -galaxy-importer==0.3.0 +galaxy-importer==0.4.0 # via -r requirements/requirements.in gunicorn==19.7.1 # via @@ -164,7 +168,7 @@ itypes==1.1.0 # via coreapi jinja2==2.10.1 # via - # ansible + # ansible-core # coreschema # sphinx jmespath==0.9.4 @@ -175,7 +179,7 @@ jog==0.1.1 # via -r requirements/requirements.in kombu==3.0.37 # via celery -markdown==3.2.1 +markdown==3.3.4 # via # -r requirements/requirements.in # galaxy-importer @@ -197,14 +201,19 @@ oauthlib==2.1.0 # via requests-oauthlib packaging==18.0 # via + # ansible-core # ansible-lint # bleach # pytest # sphinx +parsley==1.3 + # via bindep pathspec==0.5.9 # via yamllint pbr==5.1.1 - # via mock + # via + # bindep + # mock pluggy==0.13.1 # via pytest prometheus-client==0.5.0 @@ -219,11 +228,11 @@ pulpcore==3.0.0b21 # via -r requirements/requirements.in py==1.7.0 # via pytest -pycodestyle==2.5.0 +pycodestyle==2.7.0 # via flake8 pycparser==2.19 # via cffi -pyflakes==2.1.0 +pyflakes==2.3.1 # via flake8 pygithub==1.43.3 # via -r requirements/requirements.in @@ -239,18 +248,18 @@ pyopenssl==18.0.0 # via -r requirements/requirements.in pyparsing==2.3.0 # via packaging -pytest-cov==2.8.1 - # via -r requirements/dev-requirements.in -pytest-django==3.8.0 - # via -r requirements/dev-requirements.in -pytest-env==0.6.2 - # via -r requirements/dev-requirements.in pytest==5.4.1 # via # -r requirements/dev-requirements.in # pytest-cov # pytest-django # pytest-env +pytest-cov==2.8.1 + # via -r requirements/dev-requirements.in +pytest-django==3.8.0 + # via -r requirements/dev-requirements.in +pytest-env==0.6.2 + # via -r requirements/dev-requirements.in python-box==3.2.3 # via dynaconf python-dateutil==2.7.5 @@ -269,21 +278,18 @@ pytz==2018.7 # celery # django # influxdb -pyyaml==5.3.1 +pyyaml==5.4.1 # via # -r requirements/requirements.in - # ansible + # ansible-builder + # ansible-core # ansible-lint # galaxy-importer # pulpcore # yamllint redis==3.0.1 # via rq -requests-oauthlib==1.0.0 - # via - # -r requirements/requirements.in - # django-allauth -requests==2.23.0 +requests==2.26.0 # via # -r requirements/requirements.in # coreapi @@ -293,6 +299,14 @@ requests==2.23.0 # pygithub # requests-oauthlib # sphinx +requests-oauthlib==1.0.0 + # via + # -r requirements/requirements.in + # django-allauth +requirements-parser==0.2.0 + # via ansible-builder +resolvelib==0.5.4 + # via ansible-core rich==9.13.0 # via # ansible-lint @@ -307,7 +321,7 @@ ruamel.yaml==0.15.85 # drf-yasg s3transfer==0.2.0 # via boto3 -semantic-version==2.8.4 +semantic-version==2.8.5 # via # -r requirements/requirements.in # galaxy-importer @@ -333,6 +347,8 @@ sqlparse==0.2.4 # via # django # django-debug-toolbar +tenacity==8.0.1 + # via ansible-lint toml==0.10.0 # via dynaconf typing-extensions==3.7.4.3 diff --git a/requirements/requirements.in b/requirements/requirements.in index e0771e583..5095205ff 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -2,7 +2,7 @@ # NOTE(cutwater): Probably some of requirements below are obsolete. # Review required. ansible-core>=2.11,<2.12 -galaxy-importer==0.3.4 +galaxy-importer==0.4.0 gunicorn==19.7.1 markdown marshmallow diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 3b4134dd8..5cdda60f0 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.6 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/requirements.txt requirements/requirements.in @@ -10,6 +10,8 @@ alabaster==0.7.12 # via sphinx amqp==1.4.9 # via kombu +ansible-builder==1.0.1 + # via galaxy-importer ansible-core==2.11.2 # via # -r requirements/requirements.in @@ -30,6 +32,8 @@ babel==2.6.0 # via sphinx billiard==3.3.0.23 # via celery +bindep==2.9.0 + # via ansible-builder bleach==3.3.0 # via galaxy-importer bleach-allowlist==1.0.3 @@ -75,12 +79,12 @@ cryptography==3.4.3 # ansible-core # pyjwt # pyopenssl -dataclasses==0.8 - # via rich defusedxml==0.5.0 # via python3-openid deprecated==1.2.4 # via pygithub +distro==1.6.0 + # via bindep dj-database-url==0.5.0 # via -r requirements/requirements.in django==2.2.19 @@ -136,7 +140,7 @@ flake8==3.9.2 # via # -r requirements/requirements.in # galaxy-importer -galaxy-importer==0.3.4 +galaxy-importer==0.4.0 # via -r requirements/requirements.in gunicorn==19.7.1 # via @@ -144,17 +148,10 @@ gunicorn==19.7.1 # pulpcore idna==2.7 # via - # idna-ssl # requests # yarl -idna-ssl==1.1.0 - # via aiohttp imagesize==1.1.0 # via sphinx -importlib-metadata==4.5.0 - # via - # flake8 - # markdown inflection==0.3.1 # via drf-yasg influxdb==5.2.1 @@ -196,8 +193,12 @@ packaging==18.0 # ansible-lint # bleach # sphinx +parsley==1.3 + # via bindep pathspec==0.5.9 # via yamllint +pbr==5.6.0 + # via bindep prometheus-client==0.5.0 # via # -r requirements/requirements.in @@ -249,6 +250,7 @@ pytz==2018.7 pyyaml==5.4.1 # via # -r requirements/requirements.in + # ansible-builder # ansible-core # ansible-lint # galaxy-importer @@ -270,6 +272,8 @@ requests-oauthlib==1.0.0 # via # -r requirements/requirements.in # django-allauth +requirements-parser==0.2.0 + # via ansible-builder resolvelib==0.5.4 # via ansible-core rich==9.13.0 @@ -316,8 +320,6 @@ toml==0.10.0 typing-extensions==3.7.4.3 # via # aiohttp - # ansible-lint - # importlib-metadata # rich uritemplate==3.0.0 # via @@ -339,8 +341,6 @@ yamllint==1.13.0 # via -r requirements/requirements.in yarl==1.3.0 # via aiohttp -zipp==3.4.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools From 15aab87f422021814a1da0084e4dd1c716e35006 Mon Sep 17 00:00:00 2001 From: Andrew Crosby Date: Thu, 9 Sep 2021 13:57:10 -0400 Subject: [PATCH 3/3] Pin setuptools in docker base images (#2786) --- scripts/docker/dev/Dockerfile | 2 +- scripts/docker/release/Dockerfile.base | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/docker/dev/Dockerfile b/scripts/docker/dev/Dockerfile index 3fe404410..4b7259cfd 100644 --- a/scripts/docker/dev/Dockerfile +++ b/scripts/docker/dev/Dockerfile @@ -51,7 +51,7 @@ RUN python3.6 -m venv "${GALAXY_VENV}" \ && "${GALAXY_VENV}/bin/pip" install -U \ 'pip' \ 'wheel' \ - 'setuptools' \ + 'setuptools>=57,<58' \ && "${GALAXY_VENV}/bin/pip" install -r /tmp/requirements.txt COPY scripts/docker/dev/entrypoint.sh /entrypoint diff --git a/scripts/docker/release/Dockerfile.base b/scripts/docker/release/Dockerfile.base index 25027f8b0..a68cc6be4 100644 --- a/scripts/docker/release/Dockerfile.base +++ b/scripts/docker/release/Dockerfile.base @@ -20,5 +20,5 @@ RUN python3.6 -m venv ${GALAXY_VENV} \ && "${GALAXY_VENV}/bin/pip" install -U \ 'pip' \ 'wheel' \ - 'setuptools' \ + 'setuptools>=57,<58' \ && "${GALAXY_VENV}/bin/pip" install -r /tmp/requirements.txt