From 76d5ed56b8b8db486011ad3add7a04d298461354 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 13 Jan 2022 09:17:07 -0800 Subject: [PATCH 1/5] Remove 3.6 and add 3.10 based on python lifecycle --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b68df8d..b236e3f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: # Tested versions based on dates in https://devguide.python.org/devcycle/#end-of-life-branches, - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9, 3.10] steps: - uses: actions/checkout@master - name: Setup python From 852558b559fea9fce138b8801b8b5781faee4805 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 13 Jan 2022 09:20:33 -0800 Subject: [PATCH 2/5] Good grief, it's treating them as floats, so quote --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b236e3f..656a8ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: # Tested versions based on dates in https://devguide.python.org/devcycle/#end-of-life-branches, - python-version: [3.7, 3.8, 3.9, 3.10] + python-version: ['3.7', '3.8', '3.9', '3.10'] steps: - uses: actions/checkout@master - name: Setup python From f15c2fa31a14a084e1d196ce54b8b593713bc089 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 13 Jan 2022 09:25:05 -0800 Subject: [PATCH 3/5] Newer pycountry that hopefully works with 3.10 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ceff82d..ffdd5c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ jmespath==0.10.0 natsort==6.2.1 ovh==0.5.0 pycountry-convert==0.7.2 -pycountry==20.7.3 +pycountry==22.1.10 python-dateutil==2.8.1 requests==2.25.1 setuptools==44.1.1 From 93ecb2a566a551ac400df5f09765c7e8a3918efc Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 13 Jan 2022 09:35:24 -0800 Subject: [PATCH 4/5] Need newer setuptools to get things happy with 3.10 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ffdd5c0..d473bd1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,5 +11,5 @@ pycountry-convert==0.7.2 pycountry==22.1.10 python-dateutil==2.8.1 requests==2.25.1 -setuptools==44.1.1 +setuptools==60.5.0 python-transip==0.5.0 From 298787529384240df55dff837e95d8405c335ec6 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 13 Jan 2022 09:50:32 -0800 Subject: [PATCH 5/5] Looks like nose doesn't support 3.10, so for now hold off on it --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 656a8ae..8b3cca6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: # Tested versions based on dates in https://devguide.python.org/devcycle/#end-of-life-branches, - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9'] steps: - uses: actions/checkout@master - name: Setup python