Prepare semver 3 (#176)

tomschr · tomschr · commit 1117551dc08a · 2020-05-05T21:39:26.000+02:00
Generally, remove everything related to Python 2.7 &amp; 3.4 and
add missing 3.8 &amp; 3.9:

* Raise version to 2.99.99 (to indicate that it's different from 2.10.0)
* Prepare (empty) CHANGELOG for 2.99.99
* Correct Trove categories and python_requires in setup.py
* Adapt tox.ini &amp; .travis.yml: remove old stuff, add missing (see above)
* Adapt semver.py
  - Remove if clause for cmp
  - Don't check for `__name__`, use `__qualname__` instead
  - Use yield from ... (for loop is not necessary anymore)
diff --git a/.travis.yml b/.travis.yml
@@ -13,11 +13,6 @@ script: tox -v
 
 matrix:
   include:
-  - python: "2.7"
-    env: TOXENV=py27
-
-  - python: "3.4"
-    env: TOXENV=py34
 
   - python: "3.6"
     env: TOXENV=checks
@@ -32,5 +27,13 @@ matrix:
     dist: xenial
     env: TOXENV=py37
 
-  - python: "pypy"
+  - python: "3.8"
+    dist: bionic
+    env: TOXENV=py38
+
+  - python: "nightly"
+    dist: bionic
+    env: TOXENV=py39
+
+  - python: "pypy3"
     env: TOXENV=pypy
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,29 @@ Change Log
 All notable changes to this code base will be documented in this file,
 in every released version.
 
+Version 2.99.99
+===============
+
+:Released: 2020-
+:Maintainer:
+
+Features
+--------
+
+
+Bug Fixes
+---------
+
+
+Additions
+---------
+
+
+Removals
+--------
+
+
+
 Version 2.10.0
 ==============
 
diff --git a/semver.py b/semver.py
@@ -10,7 +10,7 @@
 import warnings
 
 
-__version__ = "2.10.0"
+__version__ = "2.99.99"
 __author__ = "Kostiantyn Rybnikov"
 __author_email__ = "k-bx@k-bx.com"
 __maintainer__ = ["Sebastien Celles", "Tom Schraitle"]
@@ -21,11 +21,9 @@
 SEMVER_SPEC_VERSION = "2.0.0"
 
 
-if not hasattr(__builtins__, "cmp"):
-
-    def cmp(a, b):
-        """Return negative if a<b, zero if a==b, positive if a>b."""
-        return (a > b) - (a < b)
+def cmp(a, b):
+    """Return negative if a<b, zero if a==b, positive if a>b."""
+    return (a > b) - (a < b)
 
 
 def deprecated(func=None, replace=None, version=None, category=DeprecationWarning):
@@ -56,10 +54,8 @@ def wrapper(*args, **kwargs):
         else:
             msg.append("Use the respective 'semver.VersionInfo.{r}' instead.")
 
-        # hasattr is needed for Python2 compatibility:
-        f = func.__qualname__ if hasattr(func, "__qualname__") else func.__name__
+        f = func.__qualname__
         r = replace or f
-
         frame = inspect.currentframe().f_back
 
         msg = " ".join(msg)
@@ -268,9 +264,7 @@ def _asdict(self):
 
     def __iter__(self):
         """Implement iter(self)."""
-        # As long as we support Py2.7, we can't use the "yield from" syntax
-        for v in self.to_tuple():
-            yield v
+        yield from self.to_tuple()
 
     @staticmethod
     def _increment_string(string):
diff --git a/setup.py b/setup.py
@@ -92,16 +92,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",
         "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,7 +1,7 @@
 [tox]
 envlist =
     flake8
-    py{27,34,35,36,37}
+    py{35,36,37,38,39}
     pypy
 
 [testenv]
