From 9cf4d5b93e01e2828b459ddb3bbc371d4866228b Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Fri, 1 Dec 2023 08:05:19 +0100 Subject: [PATCH 01/10] Delete python-keyczar==0.716 Keyczar is deprecated. See: https://github.com/google/keyczar Critical Vunability: https://www.cve.org/CVERecord?id=CVE-2013-7459 --- fixed-requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 21f93c6f91..6ce842af5b 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -49,7 +49,6 @@ zstandard==0.15.2 # pyOpenSSL 23.1.0 supports cryptography up to 40.0.x pyOpenSSL==23.1.0 python-editor==1.0.4 -python-keyczar==0.716 pytz==2021.1 pywinrm==0.4.1 pyyaml==5.4.1 From c23327299fd7d9dc45c2a645844793ec05839186 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Fri, 1 Dec 2023 08:48:14 +0100 Subject: [PATCH 02/10] Update CHANGELOG.rst --- CHANGELOG.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7a1bfa4e8e..23017875fe 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -82,6 +82,9 @@ Changed * Remove `distutils` dependencies across the project. #5992 Contributed by @AndroxxTraxxon +* Remove deprecated not use dependencie `python-keyczar`. #6078 + Contributed by (@philipphomberger Schwarz IT KG) + 3.8.0 - November 18, 2022 ------------------------- From ddeda0f3f8ebb6de370d83a4c387d67a249a25d9 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Fri, 1 Dec 2023 15:01:01 +0100 Subject: [PATCH 03/10] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83caf83010..d5b078070d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ jobs: # Run st2 Integration tests integration: docker: - - image: circleci/python:3.6 + - image: circleci/python:3.8 - image: mongo:4.0 - image: rabbitmq:3 working_directory: ~/st2 @@ -79,7 +79,7 @@ jobs: # Run st2 Lint Checks lint: docker: - - image: circleci/python:3.6 + - image: circleci/python:3.8 - image: mongo:4.0 - image: rabbitmq:3 working_directory: ~/st2 @@ -113,7 +113,7 @@ jobs: resource_class: large docker: # The primary container is an instance of the first list image listed. Your build commands run in this container. - - image: circleci/python:3.6 + - image: circleci/python:3.8 working_directory: ~/st2 environment: - DISTROS: "bionic focal el7 el8" From 6b947dee39e9f2657cd00fff71d7c3159eae1c2f Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Fri, 1 Dec 2023 15:03:13 +0100 Subject: [PATCH 04/10] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d5b078070d..83caf83010 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ jobs: # Run st2 Integration tests integration: docker: - - image: circleci/python:3.8 + - image: circleci/python:3.6 - image: mongo:4.0 - image: rabbitmq:3 working_directory: ~/st2 @@ -79,7 +79,7 @@ jobs: # Run st2 Lint Checks lint: docker: - - image: circleci/python:3.8 + - image: circleci/python:3.6 - image: mongo:4.0 - image: rabbitmq:3 working_directory: ~/st2 @@ -113,7 +113,7 @@ jobs: resource_class: large docker: # The primary container is an instance of the first list image listed. Your build commands run in this container. - - image: circleci/python:3.8 + - image: circleci/python:3.6 working_directory: ~/st2 environment: - DISTROS: "bionic focal el7 el8" From 5c50fb437acbb3826e31f62cb85c083c6ee6c5c7 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Mon, 4 Dec 2023 07:50:14 +0100 Subject: [PATCH 05/10] drop python 3.6 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83caf83010..d5b078070d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ jobs: # Run st2 Integration tests integration: docker: - - image: circleci/python:3.6 + - image: circleci/python:3.8 - image: mongo:4.0 - image: rabbitmq:3 working_directory: ~/st2 @@ -79,7 +79,7 @@ jobs: # Run st2 Lint Checks lint: docker: - - image: circleci/python:3.6 + - image: circleci/python:3.8 - image: mongo:4.0 - image: rabbitmq:3 working_directory: ~/st2 @@ -113,7 +113,7 @@ jobs: resource_class: large docker: # The primary container is an instance of the first list image listed. Your build commands run in this container. - - image: circleci/python:3.6 + - image: circleci/python:3.8 working_directory: ~/st2 environment: - DISTROS: "bionic focal el7 el8" From 42815e5ca54a28494fbf33790e719f25c04a5567 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Mon, 4 Dec 2023 07:54:57 +0100 Subject: [PATCH 06/10] drop python 3.6 --- .github/workflows/ci.yaml | 38 ------------------- .github/workflows/microbenchmarks.yaml | 6 --- .../workflows/orquesta-integration-tests.yaml | 6 --- .github/workflows/test.yaml | 3 -- 4 files changed, 53 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3087324189..b8c66cb025 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -54,14 +54,6 @@ jobs: # NOTE: We need to use full Python version as part of Python deps cache key otherwise # setup virtualenv step will fail. include: - - name: 'Lint Checks (black, flake8, etc.)' - task: 'ci-checks' - python-version-short: '3.6' - python-version: '3.6.13' - - name: 'Compile (pip deps, pylint, etc.)' - task: 'ci-compile' - python-version-short: '3.6' - python-version: '3.6.13' - name: 'Lint Checks (black, flake8, etc.)' task: 'ci-checks' python-version-short: '3.8' @@ -312,18 +304,6 @@ jobs: # NOTE: To speed the CI run, we split unit and integration tests into multiple jobs where # each job runs subset of tests. include: - - name: 'Unit Tests (chunk 1)' - task: 'ci-unit' - nosetests_node_total: 2 - nosetests_node_index: 0 - python-version-short: '3.6' - python-version: '3.6.13' - - name: 'Unit Tests (chunk 2)' - task: 'ci-unit' - nosetests_node_total: 2 - nosetests_node_index: 1 - python-version-short: '3.6' - python-version: '3.6.13' - name: 'Unit Tests (chunk 1)' task: 'ci-unit' nosetests_node_total: 2 @@ -499,24 +479,6 @@ jobs: include: # We run pack tests here since they rely on some integration tests set # up (aka stanley user being present, etc.) - - name: 'Pack Tests' - task: 'ci-packs-tests' - nosetests_node_total: 1 - nosetests_node_index: 0 - python-version-short: '3.6' - python-version: '3.6.13' - - name: 'Integration Tests (chunk 1)' - task: 'ci-integration' - nosetests_node_total: 2 - nosetests_node_index: 0 - python-version-short: '3.6' - python-version: '3.6.13' - - name: 'Integration Tests (chunk 2)' - task: 'ci-integration' - nosetests_node_total: 2 - nosetests_node_index: 1 - python-version-short: '3.6' - python-version: '3.6.13' - name: 'Pack Tests' task: 'ci-packs-tests' nosetests_node_total: 1 diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml index 9477b256f8..c44deb6ac3 100644 --- a/.github/workflows/microbenchmarks.yaml +++ b/.github/workflows/microbenchmarks.yaml @@ -34,12 +34,6 @@ jobs: # NOTE: We need to use full Python version as part of Python deps cache key otherwise # setup virtualenv step will fail. include: - - name: 'Microbenchmarks' - task: 'micro-benchmarks' - nosetests_node_total: 1 - nosetests_node_index: 0 - python-version-short: '3.6' - python-version: '3.6.13' - name: 'Microbenchmarks' task: 'micro-benchmarks' nosetests_node_total: 1 diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml index b45dd5fb84..0b9f8cd360 100644 --- a/.github/workflows/orquesta-integration-tests.yaml +++ b/.github/workflows/orquesta-integration-tests.yaml @@ -55,12 +55,6 @@ jobs: # NOTE: We need to use full Python version as part of Python deps cache key otherwise # setup virtualenv step will fail. include: - - name: 'Integration Tests (Orquesta)' - task: 'ci-orquesta' - nosetests_node_total: 1 - nosetests_node_index: 0 - python-version: '3.6.13' - python-version-short: '3.6' - name: 'Integration Tests (Orquesta)' task: 'ci-orquesta' nosetests_node_total: 1 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 172c0cd64d..a7b28a88d9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,9 +32,6 @@ jobs: # NOTE: We need to use full Python version as part of Python deps cache key otherwise # setup virtualenv step will fail. include: - - name: 'Test (pants runs: pytest)' - python-version-short: '3.6' - python-version: '3.6.13' - name: 'Test (pants runs: pytest)' python-version-short: '3.8' python-version: '3.8.10' From 8c2caa5efe634fd861346e3797843e840b6544fb Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Mon, 4 Dec 2023 07:58:26 +0100 Subject: [PATCH 07/10] drop python 3.6 --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 23017875fe..4fd1924e2b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -82,7 +82,7 @@ Changed * Remove `distutils` dependencies across the project. #5992 Contributed by @AndroxxTraxxon -* Remove deprecated not use dependencie `python-keyczar`. #6078 +* Drop Python 3.6. Support. Update Pipeline Templates. #6080 Contributed by (@philipphomberger Schwarz IT KG) 3.8.0 - November 18, 2022 From b82189c16e86fae1c783c8c3fc6d3d50ffaa554f Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Mon, 4 Dec 2023 07:59:19 +0100 Subject: [PATCH 08/10] drop python 3.6 --- fixed-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 6ce842af5b..21f93c6f91 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -49,6 +49,7 @@ zstandard==0.15.2 # pyOpenSSL 23.1.0 supports cryptography up to 40.0.x pyOpenSSL==23.1.0 python-editor==1.0.4 +python-keyczar==0.716 pytz==2021.1 pywinrm==0.4.1 pyyaml==5.4.1 From d991b616a2f6c3c5cbd8af1d189733747ebb003f Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Mon, 22 Apr 2024 13:10:40 +0200 Subject: [PATCH 09/10] Update CHANGELOG.rst --- CHANGELOG.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6cc3702d22..e6d246c752 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,6 +12,8 @@ Fixed Changed ~~~~~~~ * Bumped `jsonschema` 2.6.0 -> 3.2.0 now that python3.6 is not supported. #6118 +* Drop Python 3.6. Support. Update Pipeline Templates. #6080 + Contributed by (@philipphomberger Schwarz IT KG) Added ~~~~~ @@ -101,9 +103,6 @@ Changed * Remove `distutils` dependencies across the project. #5992 Contributed by @AndroxxTraxxon -* Drop Python 3.6. Support. Update Pipeline Templates. #6080 - Contributed by (@philipphomberger Schwarz IT KG) - 3.8.0 - November 18, 2022 ------------------------- From e2f2dda143ada9e278b75fdf998e6d8efc9894b3 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Mon, 22 Apr 2024 15:13:58 +0200 Subject: [PATCH 10/10] Update CHANGELOG.rst Co-authored-by: Jacob Floyd --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e6d246c752..d4a294ceb8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,7 +12,7 @@ Fixed Changed ~~~~~~~ * Bumped `jsonschema` 2.6.0 -> 3.2.0 now that python3.6 is not supported. #6118 -* Drop Python 3.6. Support. Update Pipeline Templates. #6080 +* Drop Python 3.6 testing in CircleCI. #6080 Contributed by (@philipphomberger Schwarz IT KG) Added