Drop support for Python 2 and remove dependency on future (#330)

adammcmaster · lcjohnso · yuenmichelle1 · web-flow · commit 22c14bf8e9d0 · 2025-12-29T12:25:35.000-06:00
* Drop support for Python 2 and remove dependency on future.

* Update README to reference removal of Python 2 support.

---------

Co-authored-by: Cliff Johnson &lt;cliff@zooniverse.org&gt;
Co-authored-by: yuenmichelle1 &lt;michelle.dano.yuen@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.8.0 (TBD)
+- Change: Drop support for Python 2 and remove dependency on future.
+
 ## 1.7.1 (2025-06-24)
 - New: Track logged in user
 - Fix: Batch aggregation links updated
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -4,7 +4,7 @@ RUN apk --no-cache add libmagic
 
 WORKDIR /usr/src/panoptes-python-client
 
-COPY setup.py .
+COPY setup.py README.md .
 
 RUN pip install .[testing,docs]
 
diff --git a/Dockerfile.dev2 b/Dockerfile.dev2
diff --git a/Dockerfile.stable2 b/Dockerfile.stable2
diff --git a/README.md b/README.md
@@ -30,8 +30,7 @@ Upgrade an existing installation:
 $ pip install -U panoptes-client
 ```
 
-The Panoptes Client is supported on all versions of Python 2 and 3, from Python
-2.7 onwards.
+The Panoptes Client is supported on all versions of Python 3 onwards.
 
 ## Usage Examples
 
@@ -61,12 +60,10 @@ for information about how you can get involved.
 
 ### Running the Tests
 
-You can run the tests with Docker. This will run them under Python 3 and Python
-2:
+You can run the tests with Docker. This will run them under Python 3:
 
 ```
 docker-compose build tests && docker-compose run tests
-docker-compose build tests2 && docker-compose run tests2
 ```
 
 Or you can run them directly in Python with:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -27,30 +27,3 @@ services:
       - ${HOME}/.panoptes/:/root/.panoptes/
       - ${HOME}:${HOME}
     command: python -m unittest discover
-
-  dev2:
-    build:
-      context:  ./
-      dockerfile: Dockerfile.dev2
-    volumes:
-      - ${HOME}/.panoptes/:/root/.panoptes/
-      - ${HOME}:${HOME}
-    environment:
-      - PANOPTES_DEBUG=true
-
-  tests2:
-    build:
-      context: ./
-      dockerfile: Dockerfile.dev2
-    volumes:
-      - ${HOME}/.panoptes/:/root/.panoptes/
-      - ${HOME}:${HOME}
-    command: python -m unittest discover
-
-  stable2:
-    build:
-      context: ./
-      dockerfile: Dockerfile.stable2
-    volumes:
-      - ${HOME}/.panoptes/:/root/.panoptes/
-      - ${HOME}:${HOME}
diff --git a/panoptes_client/classification.py b/panoptes_client/classification.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 from panoptes_client.panoptes import LinkResolver, PanoptesObject
 
 
diff --git a/panoptes_client/collection.py b/panoptes_client/collection.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from builtins import str
 
 from panoptes_client.panoptes import (
diff --git a/panoptes_client/collection_role.py b/panoptes_client/collection_role.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 from panoptes_client.panoptes import PanoptesObject, LinkResolver
 
 
diff --git a/panoptes_client/exportable.py b/panoptes_client/exportable.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import csv
 import datetime
 import functools
diff --git a/panoptes_client/organization.py b/panoptes_client/organization.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 from panoptes_client.panoptes import (
     LinkResolver,
     PanoptesObject,
diff --git a/panoptes_client/panoptes.py b/panoptes_client/panoptes.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from builtins import str
 
 import getpass
diff --git a/panoptes_client/project.py b/panoptes_client/project.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from copy import deepcopy
 
 from panoptes_client.panoptes import (
diff --git a/panoptes_client/project_preferences.py b/panoptes_client/project_preferences.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from builtins import str
 
 from panoptes_client.panoptes import PanoptesObject, LinkResolver
diff --git a/panoptes_client/project_role.py b/panoptes_client/project_role.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 from panoptes_client.panoptes import PanoptesObject, LinkResolver
 
 
diff --git a/panoptes_client/subject.py b/panoptes_client/subject.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from panoptes_client.subject_workflow_status import SubjectWorkflowStatus
 
 _OLD_STR_TYPES = (str,)
diff --git a/panoptes_client/subject_set.py b/panoptes_client/subject_set.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from builtins import str
 from copy import deepcopy
 from panoptes_client.subject_workflow_status import SubjectWorkflowStatus
diff --git a/panoptes_client/tests/test_inaturalist.py b/panoptes_client/tests/test_inaturalist.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import unittest
 import sys
 
diff --git a/panoptes_client/tests/test_linkcollection.py b/panoptes_client/tests/test_linkcollection.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from builtins import str
 
 import unittest
diff --git a/panoptes_client/tests/test_linkresolver.py b/panoptes_client/tests/test_linkresolver.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import unittest
 import sys
 
diff --git a/panoptes_client/tests/test_project.py b/panoptes_client/tests/test_project.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import unittest
 
 from panoptes_client import Project
diff --git a/panoptes_client/tests/test_subject_set.py b/panoptes_client/tests/test_subject_set.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import unittest
 import sys
 
diff --git a/panoptes_client/user.py b/panoptes_client/user.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 from panoptes_client.panoptes import Panoptes, PanoptesObject, LinkResolver
 from panoptes_client.utils import isiterable, split
 
diff --git a/panoptes_client/utils.py b/panoptes_client/utils.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from builtins import range
 
 import functools
diff --git a/panoptes_client/workflow.py b/panoptes_client/workflow.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from builtins import str
 from copy import deepcopy
 from panoptes_client.set_member_subject import SetMemberSubject
diff --git a/panoptes_client/workflow_version.py b/panoptes_client/workflow_version.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 from panoptes_client.panoptes import (
     Panoptes,
     PanoptesAPIException,
diff --git a/setup.py b/setup.py
@@ -18,7 +18,6 @@
     include_package_data=True,
     install_requires=[
         'requests>=2.4.2',
-        'future>=0.16',
         'python-magic>=0.4',
         'redo>=1.7',
         'six>=1.9',
@@ -30,6 +29,5 @@
         'docs': [
             'sphinx',
         ],
-        ':python_version == "2.7"': ['futures'],
     }
 )

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function`
`2`		`-`
`3`	`1`	`from panoptes_client.panoptes import LinkResolver, PanoptesObject`
`4`	`2`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function`
`2`	`1`	`from builtins import str`
`3`	`2`
`4`	`3`	`from panoptes_client.panoptes import (`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function`
`2`		`-`
`3`	`1`	`from panoptes_client.panoptes import PanoptesObject, LinkResolver`
`4`	`2`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function`
`2`		`-`
`3`	`1`	`import csv`
`4`	`2`	`import datetime`
`5`	`3`	`import functools`