From f54c8b3ceb3779ab1015b53ccc4821448799156f Mon Sep 17 00:00:00 2001 From: Alexander Saprykin Date: Mon, 17 May 2021 16:44:16 +0200 Subject: [PATCH 1/4] Remove obsolete GitHub actions workflow --- .github/main.workflow | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .github/main.workflow diff --git a/.github/main.workflow b/.github/main.workflow deleted file mode 100644 index 33001ee69..000000000 --- a/.github/main.workflow +++ /dev/null @@ -1,9 +0,0 @@ -workflow "Code linting" { - on = "push" - resolves = ["Flake8"] -} - -action "Flake8" { - uses = "cclauss/GitHub-Action-for-Flake8@0.0.1" - args = "flake8 galaxy/" -} From 49f2564f0253df09a9c3552209e538a807b294ad Mon Sep 17 00:00:00 2001 From: Andrew Crosby Date: Thu, 24 Jun 2021 10:08:20 -0400 Subject: [PATCH 2/4] Update to ansible-core 2.11 and galaxy-importer 0.3.3 (#2728) Updates include * Make requires_ansible in meta/runtime.yml mandatory for collection import * Validate FILES.json and the chksums of files it defines --- requirements/requirements.in | 4 +- requirements/requirements.txt | 89 +++++++++++++++++++++-------------- 2 files changed, 55 insertions(+), 38 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index c04650d31..cf58e3f82 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -1,8 +1,8 @@ # Common # NOTE(cutwater): Probably some of requirements below are obsolete. # Review required. -ansible>=2.9.7 -galaxy-importer==0.3.0 +ansible-core>=2.11,<2.12 +galaxy-importer==0.3.3 gunicorn==19.7.1 markdown marshmallow diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 05f08863b..8d1520da1 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.6 # To update, run: # # pip-compile --output-file=requirements/requirements.txt requirements/requirements.in @@ -10,11 +10,11 @@ alabaster==0.7.12 # via sphinx amqp==1.4.9 # via kombu -ansible-lint==5.0.3 +ansible-core==2.11.2 # via # -r requirements/requirements.in # galaxy-importer -ansible==2.9.7 +ansible-lint==5.0.12 # via # -r requirements/requirements.in # galaxy-importer @@ -22,7 +22,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 @@ -30,10 +30,10 @@ babel==2.6.0 # via sphinx billiard==3.3.0.23 # via celery -bleach-allowlist==1.0.3 - # via galaxy-importer 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 @@ -72,15 +72,29 @@ coreschema==0.0.4 # drf-yasg cryptography==3.4.3 # via - # ansible + # ansible-core # pyjwt # pyopenssl +dataclasses==0.8 + # via rich defusedxml==0.5.0 # via python3-openid deprecated==1.2.4 # via pygithub 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-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 @@ -97,26 +111,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-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 @@ -130,13 +132,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.3.3 # via -r requirements/requirements.in gunicorn==19.7.1 # via @@ -144,10 +144,17 @@ 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 @@ -156,7 +163,7 @@ itypes==1.1.0 # via coreapi jinja2==2.10.1 # via - # ansible + # ansible-core # coreschema # sphinx jmespath==0.9.4 @@ -167,7 +174,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 @@ -185,6 +192,7 @@ oauthlib==2.1.0 # via requests-oauthlib packaging==18.0 # via + # ansible-core # ansible-lint # bleach # sphinx @@ -200,11 +208,11 @@ psycopg2-binary==2.7.6.1 # pulpcore pulpcore==3.0.0b21 # via -r requirements/requirements.in -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 @@ -238,21 +246,17 @@ pytz==2018.7 # celery # django # influxdb -pyyaml==5.3.1 +pyyaml==5.4.1 # via # -r requirements/requirements.in - # ansible + # 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.25.1 # via # -r requirements/requirements.in # coreapi @@ -262,6 +266,12 @@ requests==2.23.0 # pygithub # requests-oauthlib # sphinx +requests-oauthlib==1.0.0 + # via + # -r requirements/requirements.in + # django-allauth +resolvelib==0.5.4 + # via ansible-core rich==9.13.0 # via # ansible-lint @@ -276,7 +286,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 @@ -290,6 +300,7 @@ six==1.12.0 # pyopenssl # python-dateutil # sphinx + # tenacity snowballstemmer==1.2.1 # via sphinx sphinx==1.7.9 @@ -298,11 +309,15 @@ sphinxcontrib-websupport==1.1.0 # via sphinx sqlparse==0.3.1 # via django +tenacity==7.0.0 + # via ansible-lint toml==0.10.0 # via dynaconf typing-extensions==3.7.4.3 # via # aiohttp + # ansible-lint + # importlib-metadata # rich uritemplate==3.0.0 # via @@ -324,6 +339,8 @@ 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 f56ac27e5a7b57c4e86c75922ddb78ff24d17558 Mon Sep 17 00:00:00 2001 From: Andrew Crosby Date: Fri, 25 Jun 2021 09:51:00 -0400 Subject: [PATCH 3/4] Update to galaxy-importer 0.3.4 (#2733) --- requirements/requirements.in | 2 +- requirements/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index cf58e3f82..e0771e583 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.3 +galaxy-importer==0.3.4 gunicorn==19.7.1 markdown marshmallow diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8d1520da1..3b4134dd8 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -136,7 +136,7 @@ flake8==3.9.2 # via # -r requirements/requirements.in # galaxy-importer -galaxy-importer==0.3.3 +galaxy-importer==0.3.4 # via -r requirements/requirements.in gunicorn==19.7.1 # via From ef7771e48a17b7d608234abcdafe8ebe7366d641 Mon Sep 17 00:00:00 2001 From: Alexander Saprykin Date: Mon, 28 Jun 2021 13:18:04 +0200 Subject: [PATCH 4/4] Revert "Add survey banner to home page." This reverts commit 460ebf9dfb7b73e41763ceab0710aed991027e4a. --- galaxyui/src/app/home/home.component.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/galaxyui/src/app/home/home.component.html b/galaxyui/src/app/home/home.component.html index ed0b926cd..4993a5083 100644 --- a/galaxyui/src/app/home/home.component.html +++ b/galaxyui/src/app/home/home.component.html @@ -1,11 +1,3 @@ -
- - - Please take our Ansible GalaxyNG - Roadmap Survey to help us port Galaxy to the new galaxy_ng codebase. - - -