From b3054712024d08be9e1e43f766a9aac5a7415304 Mon Sep 17 00:00:00 2001 From: AN Long Date: Fri, 8 Dec 2023 17:06:27 +0800 Subject: [PATCH 1/7] remove six dependency and bump gunicorn / gevent versions --- gunicorn_thrift/config.py | 9 ++++----- requirements_py3x.txt | 4 ++-- test_requirements_py3x.txt | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gunicorn_thrift/config.py b/gunicorn_thrift/config.py index 325d0d4..c034385 100644 --- a/gunicorn_thrift/config.py +++ b/gunicorn_thrift/config.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- -from gunicorn import six from gunicorn.config import Setting, validate_string, validate_pos_int,\ WorkerClass, validate_callable, validate_bool, validate_dict @@ -59,7 +58,7 @@ class WorkerTerm(Setting): name = "worker_term" section = "Server Hooks" validator = validate_callable(1) - type = six.callable + type = callable def worker_term(worker): pass @@ -78,7 +77,7 @@ class ClientConnected(Setting): name = "on_connected" section = "Server Hooks" validator = validate_callable(2) - type = six.callable + type = callable def on_connected(worker, addr): pass @@ -96,7 +95,7 @@ class TDecodeExceptionRaised(Setting): name = "on_tdecode_exception" section = "Server Hooks" validator = validate_callable(1) - type = six.callable + type = callable def on_tdecode_exception(err): pass @@ -113,7 +112,7 @@ class ClientConnectClosed(Setting): name = "post_connect_closed" section = "Server Hooks" validator = validate_callable(1) - type = six.callable + type = callable def post_connect_closed(worker): pass diff --git a/requirements_py3x.txt b/requirements_py3x.txt index 0b056d5..b5c5ff0 100644 --- a/requirements_py3x.txt +++ b/requirements_py3x.txt @@ -1,4 +1,4 @@ setproctitle==1.1.10 -gevent>=1.4,<1.5 -gunicorn==19.9.0 +gevent>=1.4,<24 +gunicorn>=19.9.0,<22 thriftpy2>=0.4.0 diff --git a/test_requirements_py3x.txt b/test_requirements_py3x.txt index d51b7eb..6337d0b 100644 --- a/test_requirements_py3x.txt +++ b/test_requirements_py3x.txt @@ -1,4 +1,4 @@ pytest pytest-cov -gevent>=1.4,<1.5 +gevent>=1.4,<24 thrift>=0.9.3 From 49007c9154071e7a61ef8a6cd1ae6e3511d5c6dc Mon Sep 17 00:00:00 2001 From: Timothy Hong <27667816+multifascinated@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:20:37 -0500 Subject: [PATCH 2/7] delete this dependency-review workflow; it's broken and is unnecessary because there's an account-level one now --- .github/workflows/dependency-review.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml deleted file mode 100644 index d6aa436..0000000 --- a/.github/workflows/dependency-review.yml +++ /dev/null @@ -1,18 +0,0 @@ - -name: 'Dependency Review' -on: [pull_request] - -permissions: - contents: read - -jobs: - dependency-review: - runs-on: ubuntu-latest - steps: - - name: 'Checkout Repository' - uses: actions/checkout@v2 - - name: Dependency Review - uses: github/dependency-review-action@v1 - with: - # Possible values: "critical", "high", "moderate", "low" - fail-on-severity: 'high' From d383eab6e9a424b865fbc6d721a64e54deabc785 Mon Sep 17 00:00:00 2001 From: Timothy Hong <27667816+multifascinated@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:28:46 -0500 Subject: [PATCH 3/7] Revert "delete this dependency-review workflow; it's broken and is unnecessary because there's an account-level one now" This reverts commit 49007c9154071e7a61ef8a6cd1ae6e3511d5c6dc. --- .github/workflows/dependency-review.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml new file mode 100644 index 0000000..d6aa436 --- /dev/null +++ b/.github/workflows/dependency-review.yml @@ -0,0 +1,18 @@ + +name: 'Dependency Review' +on: [pull_request] + +permissions: + contents: read + +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: 'Checkout Repository' + uses: actions/checkout@v2 + - name: Dependency Review + uses: github/dependency-review-action@v1 + with: + # Possible values: "critical", "high", "moderate", "low" + fail-on-severity: 'high' From 85d4f0d5a8f864a72358b9a8237fec799d460f67 Mon Sep 17 00:00:00 2001 From: Timothy Hong <27667816+multifascinated@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:29:46 -0500 Subject: [PATCH 4/7] fix the dependency review --- .github/workflows/dependency-review.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index d6aa436..a466664 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -3,16 +3,16 @@ name: 'Dependency Review' on: [pull_request] permissions: - contents: read + contents: read jobs: - dependency-review: - runs-on: ubuntu-latest - steps: - - name: 'Checkout Repository' - uses: actions/checkout@v2 - - name: Dependency Review - uses: github/dependency-review-action@v1 - with: - # Possible values: "critical", "high", "moderate", "low" - fail-on-severity: 'high' + dependency-review: + runs-on: ubuntu-latest + steps: + - name: 'Checkout Repository' + uses: actions/checkout@v2 + - name: Dependency Review + uses: github/dependency-review-action@v1 + with: + # Possible values: "critical", "high", "moderate", "low" + fail-on-severity: 'high' From c3c09e9693b289ccf61f1625a5c8c4128d7fc26a Mon Sep 17 00:00:00 2001 From: Timothy Hong <27667816+multifascinated@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:31:28 -0500 Subject: [PATCH 5/7] newer versions of the actions --- .github/workflows/dependency-review.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index a466664..84ef360 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Dependency Review - uses: github/dependency-review-action@v1 + uses: github/dependency-review-action@v4 with: # Possible values: "critical", "high", "moderate", "low" fail-on-severity: 'high' From 27e8133007325ec86420a5a173ab2669aa6f035b Mon Sep 17 00:00:00 2001 From: Timothy Hong <27667816+multifascinated@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:31:49 -0500 Subject: [PATCH 6/7] actually reference the correct action --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 84ef360..c2f60f8 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -12,7 +12,7 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@v4 - name: Dependency Review - uses: github/dependency-review-action@v4 + uses: actions/dependency-review-action@v4 with: # Possible values: "critical", "high", "moderate", "low" fail-on-severity: 'high' From 809abfd963898720955e32f4726fe3f303594774 Mon Sep 17 00:00:00 2001 From: Timothy Hong <27667816+multifascinated@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:34:41 -0500 Subject: [PATCH 7/7] remove the dependency review workflow again; bringing it back did not address the 'required workflow' rule --- .github/workflows/dependency-review.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml deleted file mode 100644 index c2f60f8..0000000 --- a/.github/workflows/dependency-review.yml +++ /dev/null @@ -1,18 +0,0 @@ - -name: 'Dependency Review' -on: [pull_request] - -permissions: - contents: read - -jobs: - dependency-review: - runs-on: ubuntu-latest - steps: - - name: 'Checkout Repository' - uses: actions/checkout@v4 - - name: Dependency Review - uses: actions/dependency-review-action@v4 - with: - # Possible values: "critical", "high", "moderate", "low" - fail-on-severity: 'high'