From 80f63e42a9b4bc1c7a7d70db3d0ebe4f894c1d84 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 09:30:26 +0100 Subject: [PATCH 01/12] Update requirements.txt --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 152fd2b9..69e5b901 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,7 @@ eventlet Jinja2>=2.11 # BSD License (3 clause) jsonschema!=2.5.0,>=2.0.0,<=3.2 # MIT # networkx v2.6 does not support Python3.6. Update networkx to match st2 -networkx>=2.5.1,<2.6; python_version < '3.7' -networkx>=2.6,<3; python_version >= '3.7' +networkx==3.2.1 python-dateutil PyYAML>=3.1.0 # MIT six>=1.9.0 From c8b4daec57fbd15c55d1d08f50189a5bee2ad42a Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 09:47:41 +0100 Subject: [PATCH 02/12] rm python 3.6 test --- .github/workflows/tox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 3467dea6..73c0ce2e 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.6", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - name: Checkout repository uses: actions/checkout@v4 From 9489d2b050b15ee904db3425a19bcee09cbd6887 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 09:51:02 +0100 Subject: [PATCH 03/12] Fix 3.1 because > 3.2 need python => 3.9 Fix 3.1 because > 3.2 need python => 3.9 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 69e5b901..dc1939f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ eventlet Jinja2>=2.11 # BSD License (3 clause) jsonschema!=2.5.0,>=2.0.0,<=3.2 # MIT # networkx v2.6 does not support Python3.6. Update networkx to match st2 -networkx==3.2.1 +networkx==3.1 python-dateutil PyYAML>=3.1.0 # MIT six>=1.9.0 From 40d812f4d47dd94588ec33f763fc1ed06e4de8cb Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 09:52:16 +0100 Subject: [PATCH 04/12] Update chardet to 5.2.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index dc1939f0..9b3af719 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -chardet>=3.0.2,<4.0.0 +chardet==5.2.0 eventlet Jinja2>=2.11 # BSD License (3 clause) jsonschema!=2.5.0,>=2.0.0,<=3.2 # MIT From f3ad63818eb81e13577c559fdf398a3e7b372c51 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 09:57:13 +0100 Subject: [PATCH 05/12] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9b3af719..d46de433 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ jsonschema!=2.5.0,>=2.0.0,<=3.2 # MIT # networkx v2.6 does not support Python3.6. Update networkx to match st2 networkx==3.1 python-dateutil -PyYAML>=3.1.0 # MIT -six>=1.9.0 +PyYAML==6.0.1 +six>=1.16.0 stevedore>=1.3.0 # Apache-2.0 ujson>=1.35 # BSD License yaql>=1.1.0 # Apache-2.0 From 70f9df3345c2892acd1c6054e881b53d194e7e72 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 10:00:29 +0100 Subject: [PATCH 06/12] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d46de433..315f5f6a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ chardet==5.2.0 eventlet -Jinja2>=2.11 # BSD License (3 clause) +Jinja2==3.1.2 # BSD License (3 clause) jsonschema!=2.5.0,>=2.0.0,<=3.2 # MIT # networkx v2.6 does not support Python3.6. Update networkx to match st2 networkx==3.1 From a1590a0fed850e29aa236da6fca079751bb91eab Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 10:06:24 +0100 Subject: [PATCH 07/12] Update stevedore to 5.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 315f5f6a..c0dee28f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,6 @@ networkx==3.1 python-dateutil PyYAML==6.0.1 six>=1.16.0 -stevedore>=1.3.0 # Apache-2.0 +stevedore==5.1.0 # Apache-2.0 ujson>=1.35 # BSD License yaql>=1.1.0 # Apache-2.0 From 639b6d6f0caa9d4642076a4f69c9b6cca1580265 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 10:07:22 +0100 Subject: [PATCH 08/12] Update urljson to 5.8.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c0dee28f..273d16cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,5 @@ python-dateutil PyYAML==6.0.1 six>=1.16.0 stevedore==5.1.0 # Apache-2.0 -ujson>=1.35 # BSD License +ujson==5.8.0 # BSD License yaql>=1.1.0 # Apache-2.0 From 856b3c20a2e2446693c01ce39f958a3a0cd2ae46 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 10:08:11 +0100 Subject: [PATCH 09/12] Update yaql to 2.0.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 273d16cc..1562505b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,4 @@ PyYAML==6.0.1 six>=1.16.0 stevedore==5.1.0 # Apache-2.0 ujson==5.8.0 # BSD License -yaql>=1.1.0 # Apache-2.0 +yaql==2.0.0 # Apache-2.0 From 67abcb8cb0ddb94999828d9b85a23d869180b028 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 10:08:41 +0100 Subject: [PATCH 10/12] rm not needed comment --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1562505b..79e1e9d2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ chardet==5.2.0 eventlet Jinja2==3.1.2 # BSD License (3 clause) jsonschema!=2.5.0,>=2.0.0,<=3.2 # MIT -# networkx v2.6 does not support Python3.6. Update networkx to match st2 networkx==3.1 python-dateutil PyYAML==6.0.1 From f864a079964f00f23ff72ae8e861c893338071d9 Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 10:09:45 +0100 Subject: [PATCH 11/12] Update jsonschema to 4.20.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 79e1e9d2..5874488e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ chardet==5.2.0 eventlet Jinja2==3.1.2 # BSD License (3 clause) -jsonschema!=2.5.0,>=2.0.0,<=3.2 # MIT +jsonschema==4.20.0 # MIT networkx==3.1 python-dateutil PyYAML==6.0.1 From c12cdc7b9e3b81cbd9a05ea280e941993a8ee40f Mon Sep 17 00:00:00 2001 From: Philipp Homberger Date: Tue, 5 Dec 2023 14:33:41 +0100 Subject: [PATCH 12/12] downgrade jsonschema --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5874488e..a9e73899 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,8 @@ chardet==5.2.0 eventlet Jinja2==3.1.2 # BSD License (3 clause) -jsonschema==4.20.0 # MIT +jsonschema!=2.5.0,>=2.0.0,<=3.2 # MIT +# jsonschema newer version not working: ImportError: cannot import name '_validators' from 'jsonschema' (/home/hombergerpadm/st2-python-keyczar/virtualenv/lib/python3.8/site-packages/jsonschema/__init__.py networkx==3.1 python-dateutil PyYAML==6.0.1