Update Python Versions

.travis.yml

@@ -1,14 +1,14 @@
 language: python
 matrix:
   include:
-    - python: 2.7
-    - python: 3.5
-    - python: 3.6
     - python: 3.7
     - python: 3.8
+    - python: 3.9
+    - python: 3.10
+    - python: 3.11
       dist: xenial
       sudo: true
-    - python: 3.9-dev
+    - python: 3.12-dev
       env: FAILOK=y
       dist: xenial
       sudo: true

HACKING.md

@@ -9,7 +9,7 @@ This is a developer's guide to modifying and maintaining `intervaltree`.
 
 * On Linux, you will need `apt-get`.
 
-On all systems, Python 2.6, 2.7, 3.2, 3.3, 3.4 and 3.5 are needed to run the complete test suite. 
+On all systems, Python 3.7 thru 3.12 are needed to run the complete test suite.
 
 ### Single version of Python
 
@@ -87,7 +87,7 @@ The two commands above run all the available tests on all versions of Python sup
 
 The first time you run `make`, you may be asked for your password. This is in order to install `pandoc`, a tool used for processing the README file.
 
-Running all tests requires that you have all the supported versions of Python installed. These are 2.6, 2.7, 3.2, 3.3, 3.4 and 3.5. Try to use your package manager to install them if possible. Otherwise, go to [python.org/downloads][] and install them manually.
+Running all tests requires that you have all the supported versions of Python installed. These are 3.7 thru 3.12. Try to use your package manager to install them if possible. Otherwise, go to [python.org/downloads][] and install them manually.
 
 #### Single version of Python
 

Makefile

@@ -9,7 +9,9 @@ TEMPS=$(shell                                                   \
 		-o \( -type d -name '__pycache__' \)                    \
 )
 
-PYTHONS:=2.7.18 3.5.9 3.6.11 3.7.8 3.8.5
+# See https://devguide.python.org/versions
+# Use every version that is not end-of-life.
+PYTHONS:=3.7.16 3.8.16 3.9.16 3.10.9 3.11.1 3.12.0a4
 PYTHON_MAJORS:=$(shell        \
 	echo "$(PYTHONS)" |         \
 	tr ' ' '\n' | cut -d. -f1 | \

README.md

@@ -3,7 +3,7 @@
 intervaltree
 ============
 
-A mutable, self-balancing interval tree for Python 2 and 3. Queries may be by point, by range overlap, or by range envelopment.
+A mutable, self-balancing interval tree for Python. Queries may be by point, by range overlap, or by range envelopment.
 
 This library was designed to allow tagging text and time intervals, where the intervals include the lower bound but not the upper bound.
 
@@ -26,7 +26,7 @@ pip install intervaltree
 Features
 --------
 
-* Supports Python 2.7 and Python 3.5+ (Tested under 2.7, and 3.5 thru 3.8)
+* Supports Python 3.7+ (Tested under 3.7 thru 3.12)
 * Initializing
     * blank `tree = IntervalTree()`
     * from an iterable of `Interval` objects (`tree = IntervalTree(intervals)`)

intervaltree/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Root package.

intervaltree/interval.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Interval class

intervaltree/intervaltree.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Core logic.
@@ -26,19 +26,10 @@
 from .node import Node
 from numbers import Number
 from sortedcontainers import SortedDict
+from collections.abc import MutableSet
 from copy import copy
 from warnings import warn
 
-try:
-    from collections.abc import MutableSet  # Python 3?
-except ImportError:
-    from collections import MutableSet
-
-try:
-    xrange  # Python 2?
-except NameError:  # pragma: no cover
-    xrange = range
-
 
 # noinspection PyBroadException
 class IntervalTree(MutableSet):
@@ -900,7 +891,7 @@ def envelop(self, begin, end=None):
         bound_end = boundary_table.bisect_left(end)  # up to, but not including end
         result.update(root.search_overlap(
             # slice notation is slightly slower
-            boundary_table.keys()[index] for index in xrange(bound_begin, bound_end)
+            boundary_table.keys()[index] for index in range(bound_begin, bound_end)
         ))
 
         # TODO: improve envelop() to use node info instead of less-efficient filtering
@@ -934,7 +925,7 @@ def overlap(self, begin, end=None):
         bound_end = boundary_table.bisect_left(end)  # up to, but not including end
         result.update(root.search_overlap(
             # slice notation is slightly slower
-            boundary_table.keys()[index] for index in xrange(bound_begin, bound_end)
+            boundary_table.keys()[index] for index in range(bound_begin, bound_end)
         ))
         return result
 

intervaltree/node.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Core logic: internal tree nodes.

setup.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Distribution logic
@@ -24,7 +24,6 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from __future__ import absolute_import
 import io
 import os
 from sys import exit
@@ -82,7 +81,7 @@ def run_tests(self):
     name='intervaltree',
     version=vinfo['version'],
     install_requires=['sortedcontainers >= 2.0, < 3.0'],
-    description='Editable interval tree data structure for Python 2 and 3',
+    description='Editable interval tree data structure for Python',
     long_description=long_description,
     long_description_content_type='text/markdown',
     classifiers=[  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
@@ -92,13 +91,12 @@ def run_tests(self):
         'Intended Audience :: Information Technology',
         'Intended Audience :: Science/Research',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'License :: OSI Approved :: Apache Software License',
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
         'Topic :: Scientific/Engineering :: Bio-Informatics',

test/interval_methods/__init__.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: Interval methods

test/interval_methods/binary_test.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: Intervals, methods on two intervals

test/interval_methods/sorting_test.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: Intervals, sorting methods

test/interval_methods/unary_test.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: Intervals, methods on self only

test/intervals.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: utilities to generate intervals
@@ -18,21 +18,12 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from __future__ import absolute_import
 from intervaltree import Interval
 from pprint import pprint
 from random import randint, choice
 from test.progress_bar import ProgressBar
 import os
-try:
-    xrange
-except NameError:
-    xrange = range
 
-try:
-    unicode
-except NameError:
-    unicode = str
 
 def make_iv(begin, end, label=False):
     if label:
@@ -49,7 +40,7 @@ def nogaps_rand(size=100, labels=False):
     """
     cur = -50
     result = []
-    for i in xrange(size):
+    for i in range(size):
         length = randint(1, 10)
         result.append(make_iv(cur, cur + length, labels))
         cur += length
@@ -65,7 +56,7 @@ def gaps_rand(size=100, labels=False):
     """
     cur = -50
     result = []
-    for i in xrange(size):
+    for i in range(size):
         length = randint(1, 10)
         if choice([True, False]):
             cur += length
@@ -114,7 +105,7 @@ def trepr(s):
         if docstring:
             f.write(trepr(docstring))
             f.write('\n')
-        if isinstance(imports, (str, unicode)):
+        if isinstance(imports, str):
             f.write(imports)
             f.write('\n\n')
         elif isinstance(imports, (list, tuple, set)):

test/intervaltree_methods/__init__.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: IntervalTree methods

test/intervaltree_methods/copy_test.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: IntervalTree, Copying
@@ -18,13 +18,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from __future__ import absolute_import
 from intervaltree import Interval, IntervalTree
 from test import data
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 
 
 def test_copy():

test/intervaltree_methods/debug_test.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: IntervalTree, Basic query methods (read-only)
@@ -18,15 +18,11 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from __future__ import absolute_import
 from intervaltree import Interval, IntervalTree
 import pytest
 from test import data
 from pprint import pprint, pformat
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 
 
 def test_print_empty():

test/intervaltree_methods/delete_test.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: IntervalTree, Basic deletion methods
@@ -18,14 +18,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from __future__ import absolute_import
 from intervaltree import Interval, IntervalTree
 import pytest
 from test import data, match
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 
 
 def test_delete():

test/intervaltree_methods/init_test.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: IntervalTree, initialization methods
@@ -18,14 +18,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from __future__ import absolute_import
 from intervaltree import Interval, IntervalTree
 import pytest
-
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 
 
 def test_empty_init():

test/intervaltree_methods/insert_test.py

@@ -1,5 +1,5 @@
 """
-intervaltree: A mutable, self-balancing interval tree for Python 2 and 3.
+intervaltree: A mutable, self-balancing interval tree for Python.
 Queries may be by point, by range overlap, or by range envelopment.
 
 Test module: IntervalTree, Basic insertion methods
@@ -18,14 +18,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from __future__ import absolute_import
 from intervaltree import Interval, IntervalTree
 import pytest
 from test import data, match
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 
 
 def test_insert():