From dc8a43d0932240841843b7f57cb263013051a100 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Mon, 4 Oct 2021 10:52:22 -0700 Subject: [PATCH 1/8] Adding 3.10 to actions; hopefully it'll pull the latest release candidate. RE:#78 --- .github/workflows/pythonapp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 37c6586..36144f1 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10] os: [ubuntu-latest, windows-latest, macos-latest] steps: @@ -40,4 +40,4 @@ jobs: - name: Run tests run: | - tox \ No newline at end of file + tox From 36a68bd232952ba4cf8dd32a23b8c264d905ed63 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Mon, 4 Oct 2021 10:54:38 -0700 Subject: [PATCH 2/8] Clarifying 3.10.0-rc2. RE:#78 --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 36144f1..e784cda 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9, 3.10] + python-version: [3.6, 3.7, 3.8, 3.9, "3.10.0-rc2"] os: [ubuntu-latest, windows-latest, macos-latest] steps: From 024812e3c7c34ef45038c979866675226ac0bfc2 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Mon, 4 Oct 2021 10:56:46 -0700 Subject: [PATCH 3/8] Correcting version name, needed a period in there. RE:#78 --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index e784cda..4cce6a9 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9, "3.10.0-rc2"] + python-version: [3.6, 3.7, 3.8, 3.9, "3.10.0-rc.2"] os: [ubuntu-latest, windows-latest, macos-latest] steps: From b246e8416666d0842a4bc6608f574e35685ec41c Mon Sep 17 00:00:00 2001 From: James Douglass Date: Mon, 4 Oct 2021 11:01:22 -0700 Subject: [PATCH 4/8] Noting support for python 3.10 in HISTORY. RE:#78 --- HISTORY.rst | 2 ++ setup.py | 1 + 2 files changed, 3 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index a92cbc0..489ba2b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -6,6 +6,8 @@ TaskGraph Release History Unreleased Changes ------------------ +* Testing against python 3.10 in github actions and officially noting support + for 3.10 in ``setup.py``. * Testing against python 3.9 in github actions and noting support in ``setup.py``. * Fixed an issue where exceptions raised during execution where the task diff --git a/setup.py b/setup.py index 1c2903d..b96397e 100644 --- a/setup.py +++ b/setup.py @@ -39,5 +39,6 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: BSD License' ]) From 75746ad7122284244ea1b1b51836a7f5c232224a Mon Sep 17 00:00:00 2001 From: James Douglass Date: Mon, 4 Oct 2021 11:07:42 -0700 Subject: [PATCH 5/8] Adding 3.10 to tox.ini. RE:#78 --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 82d2472..f838871 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {py36,py37,py38,py39}-{base,psutil} +envlist = {py36,py37,py38,py39,py310}-{base,psutil} [gh-actions] # Allows us to use tox configuration to manage our tests, but still run on @@ -10,6 +10,7 @@ python = 3.7: py37 3.8: py38 3.9: py39 + 3.10: py310 [testenv] commands = From a50bd289561107249b20bcd9b93e59d5a6b15510 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Mon, 4 Oct 2021 11:11:03 -0700 Subject: [PATCH 6/8] Replacing deprecated threading.currentThread() with threading.current_thread(). RE:#78 --- taskgraph/Task.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taskgraph/Task.py b/taskgraph/Task.py index 73f9ff0..8a0358f 100644 --- a/taskgraph/Task.py +++ b/taskgraph/Task.py @@ -416,7 +416,7 @@ def _task_executor(self): if self._terminated: LOGGER.debug( "taskgraph is terminated, ending %s", - threading.currentThread()) + threading.current_thread()) break task = None try: @@ -449,7 +449,7 @@ def _task_executor(self): LOGGER.warning('worker pool was already closed') LOGGER.debug( "no tasks are pending and taskgraph closed, normally " - "terminating executor %s." % threading.currentThread()) + "terminating executor %s." % threading.current_thread()) break else: # there's still the possibility for work to be added or From 4ffb980085ab0abd3446f75cdcab4bd9e3d18b52 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Tue, 5 Oct 2021 11:28:44 -0700 Subject: [PATCH 7/8] Running on 3.10 proper. RE:#78 --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 4cce6a9..36144f1 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9, "3.10.0-rc.2"] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10] os: [ubuntu-latest, windows-latest, macos-latest] steps: From d419e0088c27106933bb02fba9d32f7b243b8bb7 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Tue, 5 Oct 2021 11:30:14 -0700 Subject: [PATCH 8/8] Quoting 3.10; needed for GHA for some reason. RE:#78 --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 36144f1..17c6336 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9, 3.10] + python-version: [3.6, 3.7, 3.8, 3.9, "3.10"] os: [ubuntu-latest, windows-latest, macos-latest] steps: