Merge pull request #2793 from ansible/devel

Merge branch 'devel' into master
ansible · Sep 22, 2021 · fb9b6dc · fb9b6dc
2 parents 2fbaf9b + 15aab87
commit fb9b6dc
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 66 deletions.
diff --git 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
 
 ---
 

diff --git 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,19 +10,21 @@ 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
 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
@@ -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