Merge pull request #39 from mgedmin/drop-py2

Drop Python 2.7

.github/workflows/build.yml

@@ -20,13 +20,11 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "2.7"
           - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
-          - "pypy2.7"
           - "pypy3.7"
 
     steps:
@@ -61,12 +59,11 @@ jobs:
         run: coverage run -m zope.testrunner --test-path=src --tests-pattern="^f?tests$"
 
       - name: Check test coverage
-        run: coverage report -m --fail-under=${{ matrix.python-version == 'pypy2.7' && 98 || 100 }}
+        run: coverage report -m --fail-under=100
 
       - name: Report to coveralls
         run: coveralls
         continue-on-error: true
-        if: "matrix.python-version != '2.7' && matrix.python-version != 'pypy2.7'"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_SERVICE_NAME: github

CHANGES.rst

@@ -1,12 +1,12 @@
 Changes
 -------
 
-0.17.2 (unreleased)
+0.18.0 (unreleased)
 ~~~~~~~~~~~~~~~~~~~
 
 - Add support for Python 3.10 and 3.11.
 
-- Drop support for Python 3.6.
+- Drop support for Python 2.7 and 3.6.
 
 
 0.17.1 (2020-11-25)

Makefile

@@ -32,7 +32,7 @@ testp: bin/test                 ##: run tests in a pager
 
 .PHONY: coverage
 coverage:                       ##: measure test coverage
-	tox -e coverage3
+	tox -e coverage
 
 include release.mk
 

appveyor.yml

@@ -8,7 +8,6 @@ environment:
   matrix:
     # https://www.appveyor.com/docs/windows-images-software/#python lists
     # available versions
-    - PYTHON: "C:\\Python27-x64"
     - PYTHON: "C:\\Python37-x64"
     - PYTHON: "C:\\Python38-x64"
     - PYTHON: "C:\\Python39-x64"

setup.py

@@ -57,7 +57,6 @@ def get_long_description():
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Zope Public License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
@@ -66,6 +65,7 @@ def get_long_description():
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
+    python_requires=">=3.7",
     packages=find_packages('src'),
     include_package_data=True,
     zip_safe=False,
@@ -100,9 +100,6 @@ def get_long_description():
         # but that are dropped when you do pip install, *sigh*
         "zope.hookable",
         "RestrictedPython",
-        # ZODB depends on zc.lockfile, which dropped Python 2 compatibility but
-        # didn't add a requires_python
-        "zc.lockfile < 3.0; python_version == '2.7'"
         ],
     extras_require=dict(
         test=[

src/zodbbrowser/__init__.py

@@ -19,5 +19,5 @@
 """
 
 
-__version__ = '0.17.2.dev0'
+__version__ = '0.18.0.dev0'
 __homepage__ = 'https://github.com/mgedmin/zodbbrowser'

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py37,py38,py39,py310,py311,pypy,pypy3
+envlist = py37,py38,py39,py310,py311,pypy3
 
 [testenv]
 passenv =
@@ -30,8 +30,8 @@ commands =
     python --version
     zope-testrunner --test-path=src --tests-pattern='^f?tests$' {posargs}
 
-[testenv:coverage2]
-basepython = python2.7
+[testenv:coverage]
+basepython = python3
 commands =
     coverage run -m zope.testrunner --test-path=src --tests-pattern='^f?tests$' {posargs:-pvc}
     coverage report -m
@@ -40,12 +40,6 @@ deps =
     coverage
     {[testenv]deps}
 
-[testenv:coverage3]
-basepython = python3
-commands = {[testenv:coverage2]commands}
-usedevelop = true
-deps = {[testenv:coverage2]deps}
-
 [testenv:flake8]
 deps = flake8
 skip_install = true