From b75a927bd0475b3de8cac3ffee6da7aa0ba2e75d Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 31 Jan 2022 11:23:58 +0200 Subject: [PATCH 1/5] CI: fix targeting rules --- .github/workflows/python-package.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 1cc6b96a..5dcec1eb 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -3,7 +3,13 @@ name: Python package -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + branches: + - master jobs: test: From 34ffd8c46d16f4d5babd16e8e44cd2c7eb429610 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 31 Jan 2022 11:09:40 +0200 Subject: [PATCH 2/5] CI: fix quoting for python-version list --- .github/workflows/python-package.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 5dcec1eb..53fd4645 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -17,8 +17,13 @@ jobs: strategy: fail-fast: false matrix: - python-version: [2.7,3.5,3.6,3.7, 3.8,3.9] - + python-version: + - "2.7" + - "3.5" + - "3.6" + - "3.7" + - "3.8" + - "3.9" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From 38f44ba9e09e7e4b55e7699f59c7e2a5e71487eb Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 31 Jan 2022 11:32:20 +0200 Subject: [PATCH 3/5] CI: upgrade, don't downgrade, setuptools --- .github/workflows/python-package.yml | 2 ++ Makefile | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 53fd4645..6330e7f7 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -38,6 +38,7 @@ jobs: ${{ runner.os }}-pip- - name: Install dependencies run: | + pip install -U setuptools sudo apt-get update -qq sudo apt-get install -qq swig python-dev libxml2-dev libxmlsec1-dev make install-req @@ -59,6 +60,7 @@ jobs: ${{ runner.os }}-pip- - name: Install dependencies run: | + pip install -U setuptools sudo apt-get update -qq sudo apt-get install -qq swig python-dev libxml2-dev libxmlsec1-dev make install-req diff --git a/Makefile b/Makefile index 45d73ecb..95848867 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ TESTS=tests/src/OneLogin/saml2_tests SOURCES=$(MAIN_SOURCE) $(DEMOS) $(TESTS) install-req: - $(PIP) install --upgrade 'setuptools<45.0.0' $(PIP) install . install-test: From 891228ed247c19c22ced8c6cbe7c0dd7f4392fbd Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 31 Jan 2022 11:33:18 +0200 Subject: [PATCH 4/5] CI: run on Python 3.10 Refs #294 --- .github/workflows/python-package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6330e7f7..0f1e37f2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -24,6 +24,7 @@ jobs: - "3.7" - "3.8" - "3.9" + - "3.10" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -51,7 +52,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: "3.10" - uses: actions/cache@v2 with: path: ~/.cache/pip From 66f367de4b0462d5d3011bbc21253554162bf07a Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 31 Jan 2022 11:33:27 +0200 Subject: [PATCH 5/5] Set Python 3.10 trove specifier --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index c309285b..b49ab57f 100644 --- a/setup.py +++ b/setup.py @@ -23,6 +23,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', ], author='OneLogin', author_email='support@onelogin.com',