Merge pull request #437 from jdufresne/py3

jaraco · web-flow · commit fdffae1253c6 · 2019-09-22T22:33:20.000+02:00
Make twine Python 3 only
diff --git a/.travis.yml b/.travis.yml
@@ -30,12 +30,7 @@ matrix:
       env:
         TOXENV: docs
     - python: 3.7
-    - python: 2.7
-    - python: pypy3.5-6.0
     - python: 3.6
-    - python: 3.5
-    - python: 3.4
-    - python: pypy2.7-6.0
 
 install:
   - pip install tox codecov
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -3,6 +3,7 @@
 =========
 Changelog
 =========
+* :feature:`437`: Twine now requires Python 3.6 or later.
 * :bug:`491` Require requests 2.20 or later to avoid reported security
   vulnerabilities in earlier releases.
 * :release:`1.15.0 <2019-09-17>`
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # twine documentation build configuration file, created by
 # sphinx-quickstart on Tue Aug 13 11:51:54 2013.
 #
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -66,12 +66,12 @@ Testing
 ^^^^^^^
 
 Tests with twine are run using `tox`_, and tested against the following Python
-versions: 2.7, 3.4, 3,5, and 3.6. To run these tests locally, you will need to
-have these versions of Python installed on your machine.
+versions: 3.6 and 3.7. To run these tests locally, you will need to have these
+versions of Python installed on your machine.
 
-Either use ``tox`` to build against all supported Python versions (if
-you have them installed) or use ``tox -e py{version}`` to test against
-a specific version, e.g., ``tox -e py27`` or ``tox -e py34``.
+Either use ``tox`` to build against all supported Python versions (if you have
+them installed) or use ``tox -e py{version}`` to test against a specific
+version, e.g., ``tox -e py36`` or ``tox -e py37``.
 
 Also, always run ``tox -e lint`` before submitting a pull request.
 
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [check-manifest]
 ignore =
     .travis.yml
diff --git a/setup.py b/setup.py
@@ -44,15 +44,11 @@
         "Operating System :: POSIX :: Linux",
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy",
     ],
 
     packages=["twine", "twine.commands"],
@@ -68,7 +64,7 @@
         ],
     },
 
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires=">=3.6",
     install_requires=[
         "pkginfo >= 1.4.2",
         "readme_renderer >= 21.0",
@@ -78,9 +74,6 @@
         "tqdm >= 4.14",
     ],
     extras_require={
-        'with-blake2': [
-            'pyblake2; python_version<"3.6" and platform_python_implementation=="CPython"',
-        ],
         'keyring': [
             'keyring',
         ],
diff --git a/tests/test_check.py b/tests/test_check.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import unicode_literals
-
 import pretend
 
 from twine.commands import check
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -11,9 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
-from __future__ import unicode_literals
-
 import pretend
 import pytest
 
diff --git a/tests/test_package.py b/tests/test_package.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import unicode_literals
-import platform
 from twine import package, exceptions
 
 import pretend
@@ -214,12 +212,6 @@ def test_metadata_dictionary(gpg_signature):
     'b657a4148d05bd0098c1d6d8cc4e14e766dbe93c3a5ab6723b969da27a87bac0',
 )
 
-if platform.python_implementation().lower() == 'pypy':
-    # pyblake2 refuses to install on PyPy
-    TWINE_1_5_0_WHEEL_HEXDIGEST = TWINE_1_5_0_WHEEL_HEXDIGEST._replace(
-        blake2=None,
-    )
-
 
 def test_hash_manager():
     """Verify our HashManager works."""
diff --git a/tests/test_settings.py b/tests/test_settings.py
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import unicode_literals
 import os.path
 import textwrap
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import unicode_literals
-
 import pretend
 import pytest
 from requests.exceptions import HTTPError
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -11,9 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
-from __future__ import unicode_literals
-
 import sys
 import os.path
 import textwrap
@@ -333,7 +330,7 @@ def keyring_no_backends(monkeypatch):
     has no backends for the system, the backend will be a
     fail.Keyring, which raises RuntimeError on get_password.
     """
-    class FailKeyring(object):
+    class FailKeyring:
         @staticmethod
         def get_password(system, username):
             raise RuntimeError("fail!")
@@ -347,7 +344,7 @@ def keyring_no_backends_get_credential(monkeypatch):
     has no backends for the system, the backend will be a
     fail.Keyring, which raises RuntimeError on get_password.
     """
-    class FailKeyring(object):
+    class FailKeyring:
         @staticmethod
         def get_credential(system, username):
             raise RuntimeError("fail!")
@@ -371,7 +368,7 @@ def test_get_password_runtime_error_suppressed(
 
 
 def test_no_positional_on_method():
-    class T(object):
+    class T:
         @utils.no_positional(allow_self=True)
         def __init__(self, foo=False):
             self.foo = foo
diff --git a/tests/test_wheel.py b/tests/test_wheel.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import unicode_literals
-
 from twine import wheel
 
 import pytest
@@ -32,11 +30,11 @@ def test_version_parsing(example_wheel):
 
 def test_find_metadata_files():
     names = [
-        b'package/lib/__init__.py',
-        b'package/lib/version.py',
-        b'package/METADATA.txt',
-        b'package/METADATA.json',
-        b'package/METADATA',
+        'package/lib/__init__.py',
+        'package/lib/version.py',
+        'package/METADATA.txt',
+        'package/METADATA.json',
+        'package/METADATA',
     ]
     expected = [
         ['package', 'METADATA'],
diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,12 @@
 [tox]
 minversion = 2.4
-envlist = lint,docs,py37,py27,pypy3,py36,py35,py34,pypy
+envlist = lint,docs,py37,py36
 
 [testenv]
 deps =
     coverage
     pretend
     pytest
-extras =
-    with-blake2
 commands =
     coverage run --source twine -m pytest {posargs:tests}
     coverage report -m
@@ -25,6 +23,7 @@ commands =
     twine check dist/*
 
 [testenv:release]
+basepython = python3
 deps =
     wheel
 commands =
diff --git a/twine/__init__.py b/twine/__init__.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
-
 __all__ = (
     "__title__", "__summary__", "__uri__", "__version__", "__author__",
     "__email__", "__license__", "__copyright__",
diff --git a/twine/__main__.py b/twine/__main__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2013 Donald Stufft
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
-from __future__ import unicode_literals
-
 import sys
 
 import requests
diff --git a/twine/cli.py b/twine/cli.py
@@ -11,9 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
-from __future__ import unicode_literals
-
 import argparse
 import pkg_resources
 import setuptools
diff --git a/twine/commands/__init__.py b/twine/commands/__init__.py
@@ -11,9 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
-from __future__ import unicode_literals
-
 import glob
 import os.path
 
diff --git a/twine/commands/check.py b/twine/commands/check.py
@@ -11,9 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
-from __future__ import unicode_literals
-
 import argparse
 import cgi
 import re
@@ -45,7 +42,7 @@
 )
 
 
-class _WarningStream(object):
+class _WarningStream:
     def __init__(self):
         self.output = StringIO()
 
diff --git a/twine/commands/register.py b/twine/commands/register.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, unicode_literals, print_function
-
 import argparse
 import os.path
 
@@ -24,12 +22,12 @@
 def register(register_settings, package):
     repository_url = register_settings.repository_config['repository']
 
-    print("Registering package to {}".format(repository_url))
+    print(f"Registering package to {repository_url}")
     repository = register_settings.create_repository()
 
     if not os.path.exists(package):
         raise exceptions.PackageNotFound(
-            '"{}" does not exist on the file system.'.format(package)
+            f'"{package}" does not exist on the file system.'
         )
 
     resp = repository.register(
diff --git a/twine/commands/upload.py b/twine/commands/upload.py
@@ -11,9 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
-from __future__ import unicode_literals
-
 import argparse
 import os.path
 
@@ -28,7 +25,7 @@ def skip_upload(response, skip_existing, package):
     filename = package.basefilename
     msg_400 = (
         # Old PyPI message:
-        'A file named "{}" already exists for'.format(filename),
+        f'A file named "{filename}" already exists for',
         # Warehouse message:
         'File already exists',
         # Nexus Repository OSS message:
@@ -60,7 +57,7 @@ def upload(upload_settings, dists):
     upload_settings.check_repository_url()
     repository_url = upload_settings.repository_config['repository']
 
-    print("Uploading distributions to {}".format(repository_url))
+    print(f"Uploading distributions to {repository_url}")
 
     repository = upload_settings.create_repository()
     uploaded_packages = []
diff --git a/twine/package.py b/twine/package.py
diff --git a/twine/repository.py b/twine/repository.py
diff --git a/twine/settings.py b/twine/settings.py
diff --git a/twine/utils.py b/twine/utils.py
diff --git a/twine/wheel.py b/twine/wheel.py
diff --git a/twine/wininst.py b/twine/wininst.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-#`
`3`	`1`	`# twine documentation build configuration file, created by`
`4`	`2`	`# sphinx-quickstart on Tue Aug 13 11:51:54 2013.`
`5`	`3`	`#`