Fix #176: Prepare semver 3.0.0-alpha0

tomschr · tomschr · commit a7bf108a73ae · 2020-10-17T23:49:26.000+02:00
* Remove targets py27, py34, py35, and pypy from `tox.ini`
* Update `README.rst` and remove anything related to Python2
  Mention maintenance branch `maint/v2`
* `setup.py`
  - Update Trove classifiers
  - Require now Python &gt;=3.5.*
  - Remove Tox and Clean classes, try to make it
    as simple as possible
* `semver.py`
  - Change version number to "3.0.0-alpha0"
  - Remove old code related to Python2
* `tox.ini`
  - Remove py27, py34, and py35 (out of maintenance)
  - Add docs to default testenv
  - Remove --universal from bdist_wheel
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,34 @@ Change Log
 All notable changes to this code base will be documented in this file,
 in every released version.
 
+Version 3.0.0-alpha0
+====================
+
+:Released:
+:Maintainer:
+
+Features
+--------
+
+n/a
+
+Bug Fixes
+---------
+
+n/a
+
+Additions
+---------
+
+n/a
+
+
+Deprecations
+------------
+
+n/a
+
+
 
 Version 2.11.0
 ==============
diff --git a/README.rst b/README.rst
@@ -9,18 +9,13 @@ A Python module for `semantic versioning`_. Simplifies comparing versions.
 
 .. teaser-end
 
-.. warning::
+.. note::
 
-   As anything comes to an end, this project will focus on Python 3.x only.
-   New features and bugfixes will be integrated into the 3.x.y branch only.
-
-   Major version 3 of semver will contain some incompatible changes:
-
-   * removes support for Python 2.7 and 3.3
-   * removes deprecated functions.
+   This project works for Python 3 only. If you are looking for a compatible
+   version for Python 2, use the maintenance branch ``maint/v2``.
 
    The last version of semver which supports Python 2.7 and 3.4 will be
-   2.10.x. However, keep in mind, version 2.10.x is frozen: no new
+   2.11.x. However, keep in mind, version 2.11.x is frozen: no new
    features nor backports will be integrated.
 
    We recommend to upgrade your workflow to Python 3.x to gain support,
diff --git a/semver.py b/semver.py
@@ -14,7 +14,7 @@
 PY3 = sys.version_info[0] == 3
 
 
-__version__ = "2.11.0"
+__version__ = "3.0.0-alpha0"
 __author__ = "Kostiantyn Rybnikov"
 __author_email__ = "k-bx@k-bx.com"
 __maintainer__ = ["Sebastien Celles", "Tom Schraitle"]
@@ -76,37 +76,17 @@ def u(s):
         return s
 
 
-else:  # pragma: no cover
-    string_types = unicode, str
-    text_type = unicode
-    binary_type = str
-
-    def b(s):
-        return s
-
-    # Workaround for standalone backslash
-    def u(s):
-        return unicode(s.replace(r"\\", r"\\\\"), "unicode_escape")
-
-
 def ensure_str(s, encoding="utf-8", errors="strict"):
     # Taken from six project
     """
     Coerce *s* to `str`.
 
-    For Python 2:
-      - `unicode` -> encoded to `str`
-      - `str` -> `str`
-
-    For Python 3:
-      - `str` -> `str`
-      - `bytes` -> decoded to `str`
+    - `str` -> `str`
+    - `bytes` -> decoded to `str`
     """
     if not isinstance(s, (text_type, binary_type)):
         raise TypeError("not expecting type '%s'" % type(s))
-    if PY2 and isinstance(s, text_type):
-        s = s.encode(encoding, errors)
-    elif PY3 and isinstance(s, binary_type):
+    elif isinstance(s, binary_type):
         s = s.decode(encoding, errors)
     return s
 
@@ -336,19 +316,6 @@ def to_dict(self):
             )
         )
 
-    # For compatibility reasons:
-    @deprecated(replace="semver.VersionInfo.to_tuple", version="2.10.0")
-    def _astuple(self):
-        return self.to_tuple()  # pragma: no cover
-
-    _astuple.__doc__ = to_tuple.__doc__
-
-    @deprecated(replace="semver.VersionInfo.to_dict", version="2.10.0")
-    def _asdict(self):
-        return self.to_dict()  # pragma: no cover
-
-    _asdict.__doc__ = to_dict.__doc__
-
     def __iter__(self):
         """Implement iter(self)."""
         # As long as we support Py2.7, we can't use the "yield from" syntax
@@ -693,15 +660,15 @@ def parse(cls, version):
         """
         Parse version string to a VersionInfo instance.
 
+        .. versionchanged:: 2.11.0
+           Changed method from static to classmethod to
+           allow subclasses.
+
         :param version: version string
         :return: a :class:`VersionInfo` instance
         :raises: :class:`ValueError`
         :rtype: :class:`VersionInfo`
 
-        .. versionchanged:: 2.11.0
-           Changed method from static to classmethod to
-           allow subclasses.
-
         >>> semver.VersionInfo.parse('3.4.5-pre.2+build.4')
         VersionInfo(major=3, minor=4, patch=5, \
 prerelease='pre.2', build='build.4')
diff --git a/setup.py b/setup.py
@@ -1,65 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import semver as package
-from glob import glob
-from os import remove
 from os.path import dirname, join
 from setuptools import setup
-from setuptools.command.test import test as TestCommand
-
-try:
-    from setuptools.command.clean import clean as CleanCommand
-except ImportError:
-    from distutils.command.clean import clean as CleanCommand
-from shlex import split
-from shutil import rmtree
-
-
-class Tox(TestCommand):
-    user_options = [("tox-args=", "a", "Arguments to pass to tox")]
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.tox_args = None
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        from tox import cmdline
-
-        args = self.tox_args
-        if args:
-            args = split(self.tox_args)
-        errno = cmdline(args=args)
-        exit(errno)
-
-
-class Clean(CleanCommand):
-    def run(self):
-        CleanCommand.run(self)
-        delete_in_root = ["build", ".cache", "dist", ".eggs", "*.egg-info", ".tox"]
-        delete_everywhere = ["__pycache__", "*.pyc"]
-        for candidate in delete_in_root:
-            rmtree_glob(candidate)
-        for visible_dir in glob("[A-Za-z0-9]*"):
-            for candidate in delete_everywhere:
-                rmtree_glob(join(visible_dir, candidate))
-                rmtree_glob(join(visible_dir, "*", candidate))
-
-
-def rmtree_glob(file_glob):
-    for fobj in glob(file_glob):
-        try:
-            rmtree(fobj)
-            print("%s/ removed ..." % fobj)
-        except OSError:
-            try:
-                remove(fobj)
-                print("%s removed ..." % fobj)
-            except OSError:
-                pass
 
 
 def read_file(filename):
@@ -92,17 +34,15 @@ def read_file(filename):
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "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.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        # "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires=">=3.5.*",
     tests_require=["tox", "virtualenv"],
-    cmdclass={"clean": Clean, "test": Tox},
     entry_points={"console_scripts": ["pysemver = semver:main"]},
 )
diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
 envlist =
     flake8
-    py{27,34,35,36,37}
-    pypy
+    py{36,37,38,39}
+    docs
 
 [testenv]
-description = Run test suite
+description = Run test suite for {basepython}
 whitelist_externals = make
 commands = pytest {posargs:}
 deps =
@@ -58,13 +58,12 @@ deps = sphinx
 skip_install = true
 commands = make -C docs man
 
-
 [testenv:prepare-dist]
 description = Prepare for TestPyPI
 basepython = python3
 deps =
     wheel
     twine
 commands =
-    python3 setup.py sdist bdist_wheel --universal
+    python3 setup.py sdist bdist_wheel
     twine check dist/*
