Drop stale Python versions, test only on new ones

.travis.yml

@@ -1,15 +1,13 @@
 language: python
 sudo: false
 python:
-    - "2.6"
-    - "2.7"
-    - "3.3"
-    - "3.4"
-    - "3.5"
-    - "pypy"
+    - "3.6"
+    - "3.7"
+    - "3.8"
+    - "3.9"
+    - "pypy3"
 install:
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -r requirements26.txt; fi
-    - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then pip install -r requirements.txt; fi
+    - pip install -r requirements.txt
 script:
     - nosetests
 after_success:

README.md

@@ -26,7 +26,7 @@ Querylist can be installed like any other python package:
 
     > pip install querylist
 
-Querylist is tested against Python 2.6, 2.7, 3.3, 3.4, and pypy.
+Querylist is tested against Python 3.6+ and pypy.
 
 ## Usage
 

docs/source/changelog.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+**0.5.0**
+
+* Dropped support for Python 2
+* Dropped support for all Python 3 versions below Python 3.6.
+* Dropped support for PyPy based on Python 2.7.
+
 **0.4.0**
 
 * Fixed an issue building wheels caused by an empty string as a requirement in

docs/source/installation.rst

@@ -10,4 +10,4 @@ the querylist module.
 
     >>> from querylist import BetterDict, QueryList
 
-Querylist is tested against Python 2.6, 2.7, 3.3, 3.4, and pypy.
+Querylist is tested against Python 3.6+ and pypy.

querylist/__init__.py

@@ -2,7 +2,7 @@
 from querylist.list import QueryList
 from querylist.dict import BetterDict
 
-__version__ = '0.4.0'
+__version__ = '0.5.0'
 __author__ = 'Thomas Welfley'
 
 __all__ = ['QueryList', 'BetterDict']

requirements.txt

@@ -1,14 +1,14 @@
 # Testing requirements.
-coveralls==1.1
-flake8==2.3.0
+coveralls==3.0.0
+flake8==3.8.4
 frosted==1.4.1
 nose==1.3.7
-pep257==0.4.1
-spec==1.2.2
-testtube==1.0.0
+pep257==0.7.0
+spec==1.4.1
+testtube==1.1.0
 
 # Documentation requirements.
-Pygments==1.5
-Jinja2==2.6
-docutils==0.9.1
-Sphinx==1.1.3
+Pygments==2.7.4
+Jinja2==2.11.2
+docutils==0.16
+Sphinx==3.4.3

setup.py

@@ -1,22 +1,11 @@
-import sys
+from pathlib import Path
 
 from setuptools import setup, find_packages
 
 import querylist
 
-
-tests_require = [
-    'nose>=1.3.6,<1.4',
-    'spec>=1.2.2,<1.3',
-]
-
-if sys.version_info < (2, 7):
-    # spec causes python setup.py test to fail. This import fixes that for
-    # some reason.
-    import multiprocessing  # noqa
-
-    # If we're still on python 2.6, we need unittest2
-    tests_require.append('unittest2<1.2')
+with open(Path(__file__).absolute().parent / 'README.md', encoding='utf-8') as f:
+    long_description = f.read()
 
 setup(
     name='querylist',
@@ -29,12 +18,23 @@
                 'ORM-esque filtering, excluding, and getting for lists. It '
                 'also provides BetterDict, a dot lookup/assignment capable '
                 'wrapper for dicts that is 100% backwards compatible.',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    license='MIT',
     packages=find_packages(),
-    tests_require=tests_require,
+    tests_require=['nose>=1.3.7,<1.4', 'spec>=1.4.1,<1.5'],
     classifiers=[
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Topic :: Software Development :: Libraries',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
     ],
     test_suite='nose.collector',
 )

tests/betterdict_dict_tests.py

@@ -1,6 +1,6 @@
-from querylist import BetterDict
+from unittest import TestCase
 
-from tests.base import TestCase
+from querylist import BetterDict
 
 
 class BetterDictActsAsDict(TestCase):

tests/betterdict_tests.py

@@ -1,9 +1,8 @@
 from copy import deepcopy
+from unittest import TestCase
 
 from querylist import BetterDict
 
-from tests.base import TestCase
-
 SRC_DICT = {
     'foo': 1,
     'bar': {

tests/betterdictlookup_tests.py

@@ -1,6 +1,6 @@
-from querylist.dict import BetterDictLookUp
+from unittest import TestCase
 
-from tests.base import TestCase
+from querylist.dict import BetterDictLookUp
 
 
 class BetterDictLookUpInstancesCan(TestCase):

tests/comparator_tests.py

@@ -1,6 +1,6 @@
-from querylist.fieldlookup import FieldLookup
+from unittest import TestCase
 
-from tests.base import TestCase
+from querylist.fieldlookup import FieldLookup
 
 fl = FieldLookup
 

tests/fieldlookup_tests.py

@@ -1,8 +1,8 @@
+from unittest import TestCase
+
 from querylist import BetterDict
 from querylist.fieldlookup import FieldLookup, field_lookup
 
-from tests.base import TestCase
-
 
 class FieldLookupTests(TestCase):
     def setUp(self):

tests/querylist_list_tests.py

@@ -1,6 +1,6 @@
-from querylist import BetterDict, QueryList
+from unittest import TestCase
 
-from tests.base import TestCase
+from querylist import BetterDict, QueryList
 
 
 class QueryListAddition(TestCase):

tests/querylist_tests.py

@@ -1,6 +1,6 @@
-from querylist import QueryList, BetterDict
+from unittest import TestCase
 
-from tests.base import TestCase
+from querylist import BetterDict, QueryList
 from tests.fixtures import SITE_LIST