From 9470ec4d178b95f58ce4466467c189a2653e974c Mon Sep 17 00:00:00 2001 From: Jason Wallace Date: Tue, 18 Jul 2023 13:58:32 +0200 Subject: [PATCH 1/6] Upgrade PyYAML to 6.0.1. --- ansible-role/molecule/requirements.txt | 2 +- bundler/bundle/requirements.txt | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible-role/molecule/requirements.txt b/ansible-role/molecule/requirements.txt index 22c92fa2b..34b6b5710 100644 --- a/ansible-role/molecule/requirements.txt +++ b/ansible-role/molecule/requirements.txt @@ -46,7 +46,7 @@ PyNaCl==1.5.0 pyparsing==3.0.9 python-dateutil==2.8.2 python-slugify==6.1.2 -PyYAML==5.4.1 +PyYAML==6.0.1 requests==2.28.1 rich==12.5.1 selinux==0.2.1 diff --git a/bundler/bundle/requirements.txt b/bundler/bundle/requirements.txt index 52f7afe43..c633e19eb 100644 --- a/bundler/bundle/requirements.txt +++ b/bundler/bundle/requirements.txt @@ -13,4 +13,4 @@ MarkupSafe==2.1.1 packaging==21.3 pycparser==2.21 pyparsing==3.0.9 -PyYAML==6.0 +PyYAML==6.0.1 diff --git a/requirements.txt b/requirements.txt index d6bcc0728..a2a125ad2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ eventlet==0.31.0 Flask==1.1.1 Flask-SocketIO==5.0.1 Flask-WTF==0.14.3 -pyyaml==5.4.1 +pyyaml==6.0.1 # Indirect dependencies bidict==0.21.2 From bd175b55079a08db59f677eb54ff5498438c41a9 Mon Sep 17 00:00:00 2001 From: Jason Wallace Date: Tue, 18 Jul 2023 13:59:11 +0200 Subject: [PATCH 2/6] Test bundle build. --- .circleci/continue_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index f1644caad..348a1bd19 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -10,7 +10,7 @@ parameters: # In order to enable bundle building on a feature branch, you can # temporarily change the below default to be: << pipeline.git.branch >> # Don’t forget to revert this before merging your branch! - default: master + default: << pipeline.git.branch >> jobs: check_whitespace: docker: From c1bb22e67eb1d5fb17dcc25d7bef8fc9c13e9039 Mon Sep 17 00:00:00 2001 From: Jason Wallace Date: Tue, 18 Jul 2023 14:34:55 +0200 Subject: [PATCH 3/6] Revert Ansible requirements. --- bundler/bundle/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundler/bundle/requirements.txt b/bundler/bundle/requirements.txt index c633e19eb..52f7afe43 100644 --- a/bundler/bundle/requirements.txt +++ b/bundler/bundle/requirements.txt @@ -13,4 +13,4 @@ MarkupSafe==2.1.1 packaging==21.3 pycparser==2.21 pyparsing==3.0.9 -PyYAML==6.0.1 +PyYAML==6.0 From 7bc33361e28900f115726a1bd4783ac83ed5a737 Mon Sep 17 00:00:00 2001 From: Jason Wallace Date: Tue, 18 Jul 2023 14:42:40 +0200 Subject: [PATCH 4/6] Update dependencies. --- ansible-role/molecule/requirements.txt | 2 +- app/license_notice.py | 2 +- bundler/bundle/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible-role/molecule/requirements.txt b/ansible-role/molecule/requirements.txt index 34b6b5710..8f6fdac4f 100644 --- a/ansible-role/molecule/requirements.txt +++ b/ansible-role/molecule/requirements.txt @@ -46,7 +46,7 @@ PyNaCl==1.5.0 pyparsing==3.0.9 python-dateutil==2.8.2 python-slugify==6.1.2 -PyYAML==6.0.1 +PyYAML==6.0 requests==2.28.1 rich==12.5.1 selinux==0.2.1 diff --git a/app/license_notice.py b/app/license_notice.py index 6d8899633..211b6ef21 100644 --- a/app/license_notice.py +++ b/app/license_notice.py @@ -94,7 +94,7 @@ class LicenseMetadata: name='pyyaml', homepage_url='https://pyyaml.org', license_url= - 'https://raw.githubusercontent.com/yaml/pyyaml/5.4.1/LICENSE', + 'https://raw.githubusercontent.com/yaml/pyyaml/6.0.1/LICENSE', ), LicenseMetadata( name='bidict', diff --git a/bundler/bundle/requirements.txt b/bundler/bundle/requirements.txt index 52f7afe43..c633e19eb 100644 --- a/bundler/bundle/requirements.txt +++ b/bundler/bundle/requirements.txt @@ -13,4 +13,4 @@ MarkupSafe==2.1.1 packaging==21.3 pycparser==2.21 pyparsing==3.0.9 -PyYAML==6.0 +PyYAML==6.0.1 From c3ea9a47c4ae61f92ff171d20a161f0db5dfc175 Mon Sep 17 00:00:00 2001 From: Jason Wallace Date: Tue, 18 Jul 2023 14:52:04 +0200 Subject: [PATCH 5/6] Let molecule use PyYAML 5.3.1. --- ansible-role/molecule/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-role/molecule/requirements.txt b/ansible-role/molecule/requirements.txt index 8f6fdac4f..b7cc5b4d1 100644 --- a/ansible-role/molecule/requirements.txt +++ b/ansible-role/molecule/requirements.txt @@ -46,7 +46,7 @@ PyNaCl==1.5.0 pyparsing==3.0.9 python-dateutil==2.8.2 python-slugify==6.1.2 -PyYAML==6.0 +PyYAML==5.3.1 requests==2.28.1 rich==12.5.1 selinux==0.2.1 From 675e825f4dff5344ae2b8391097860d5de7f6bd7 Mon Sep 17 00:00:00 2001 From: Jason Wallace Date: Tue, 18 Jul 2023 15:09:59 +0200 Subject: [PATCH 6/6] Revert "Test bundle build." This reverts commit bd175b55079a08db59f677eb54ff5498438c41a9. --- .circleci/continue_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 348a1bd19..f1644caad 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -10,7 +10,7 @@ parameters: # In order to enable bundle building on a feature branch, you can # temporarily change the below default to be: << pipeline.git.branch >> # Don’t forget to revert this before merging your branch! - default: << pipeline.git.branch >> + default: master jobs: check_whitespace: docker: