Drop support for EOL Python 2.7 (#108)

* Drop support for legacy Python 2.7

* Drop the dot https://twitter.com/pytestdotorg/status/753767547866972160

* Mock is part of stdlib in Python 3

* Upgrade Python syntax with pyupgrade --py3-plus

* Drop support for legacy Python 2.7

* Remove redundant compat.py

* Drop support for legacy Python 2.7

* pylint fixes

* Drop support for legacy Python 2.7

* Add note for Python 2 users

* Sort imports

* Remove py3x-configparser

Author: hugovk

.travis.yml

@@ -1,21 +1,11 @@
 language: python
-dist: xenial
 
 python:
-  - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"
-
-# also test PyPy; do this on Trusty due to
-# https://travis-ci.community/t/pypy-2-7-on-xenial/889
-matrix:
-  include:
-    - python: "pypy"
-      dist: trusty
-    - python: "pypy3"
-      dist: trusty
+  - "pypy3"
 
 install:
   - git config --global user.email "[email protected]"

Dockerfile

@@ -9,7 +9,7 @@ RUN cd /.pyenv \
 
 # only install certain versions for tox to use
 RUN pyenv versions
-RUN pyenv global system 2.7.15 3.5.7 3.6.9 3.7.5 3.8.0 pypy2.7-7.2.0 pypy3.6-7.2.0
+RUN pyenv global system 3.5.7 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0
 
 RUN git config --global user.email "[email protected]"
 RUN git config --global user.name "Bumpversion Test"

Makefile

@@ -3,7 +3,7 @@ test:
 	docker-compose run test
 
 local_test:
-	PYTHONPATH=. py.test tests/
+	PYTHONPATH=. pytest tests/
 
 lint:
 	pip install pylint

README.md

@@ -27,7 +27,12 @@ commits and tags:
 * works without any VCS, but happily reads tag information from and writes
   commits and tags to Git and Mercurial if available
 * just handles text files, so it's not specific to any programming language
-* supports Python2, Python3 and Pypy
+* supports Python 3 and PyPy3
+
+If you want to use Python 2, use `pip>=9` and you'll get the last supported version,
+or pin `bump2version<1`.
+
+
 
 <!---
 ## Screencast
@@ -150,7 +155,7 @@ General configuration is grouped in a `[bumpversion]` section.
 
   The name of the tag that will be created. Only valid when using `--tag` / `tag = True`.
 
-  This is templated using the [Python Format String Syntax](http://docs.python.org/2/library/string.html#format-string-syntax).  
+  This is templated using the [Python Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax).  
   Available in the template context are `current_version` and `new_version`
   as well as `current_[part]` and `new_[part]` (e.g. '`current_major`'
   or '`new_patch`').
@@ -184,7 +189,7 @@ General configuration is grouped in a `[bumpversion]` section.
 
   The commit message to use when creating a commit. Only valid when using `--commit` / `commit = True`.
 
-  This is templated using the [Python Format String Syntax](http://docs.python.org/2/library/string.html#format-string-syntax).  
+  This is templated using the [Python Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax).  
   Available in the template context are `current_version` and `new_version`
   as well as `current_[part]` and `new_[part]` (e.g. '`current_major`'
   or '`new_patch`').
@@ -288,7 +293,7 @@ This configuration is in the section: `[bumpversion:file:…]`
 #### `parse =`
   **default:** `(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)`
 
-  Regular expression (using [Python regular expression syntax](http://docs.python.org/2/library/re.html#regular-expression-syntax)) on
+  Regular expression (using [Python regular expression syntax](https://docs.python.org/3/library/re.html#regular-expression-syntax)) on
   how to find and parse the version string.
 
   Is required to parse all strings produced by `serialize =`. Named matching
@@ -302,7 +307,7 @@ This configuration is in the section: `[bumpversion:file:…]`
   Template specifying how to serialize the version parts back to a version
   string.
 
-  This is templated using the [Python Format String Syntax](http://docs.python.org/2/library/string.html#format-string-syntax).
+  This is templated using the [Python Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax).
   Available in the template context are parsed values of the named groups
   specified in `parse =` as well as all environment variables (prefixed with
   `$`).
@@ -329,7 +334,7 @@ serialize =
   Template string how to search for the string to be replaced in the file.
   Useful if the remotest possibility exists that the current version number
   might be present multiple times in the file and you mean to only bump one of the
-  occurences. Can be multiple lines, templated using [Python Format String Syntax](http://docs.python.org/2/library/string.html#format-string-syntax)
+  occurrences. Can be multiple lines, templated using [Python Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax)
 
 #### `replace =`
   **default:** `{new_version}`
@@ -354,7 +359,7 @@ search = MyProject=={current_version}
 replace = MyProject=={new_version}
 ```
 
-  Can be multiple lines, templated using [Python Format String Syntax](http://docs.python.org/2/library/string.html#format-string-syntax).
+  Can be multiple lines, templated using [Python Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax).
 
 ## Command-line Options
 

appveyor.yml

@@ -5,12 +5,6 @@ build: off
 
 environment:
   matrix:
-    - PYTHON: "C:/Python27"
-      TOXENV: "py27"
-
-    - PYTHON: "C:/Python27"
-      TOXENV: "py27-configparser"
-
     - PYTHON: "C:/Python35"
       TOXENV: "py35"
 

bumpversion/cli.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import argparse
 from datetime import datetime
 import io
@@ -11,19 +8,18 @@
 import sre_constants
 import sys
 import warnings
+from configparser import (
+    ConfigParser,
+    RawConfigParser,
+    NoOptionError,
+)
 
 from bumpversion import __version__, __title__
 from bumpversion.version_part import (
     VersionConfig,
     NumericVersionPartConfiguration,
     ConfiguredVersionPartConfiguration,
 )
-from bumpversion.compat import (
-    ConfigParser,
-    StringIO,
-    RawConfigParser,
-    NoOptionError,
-)
 from bumpversion.exceptions import (
     IncompleteVersionRepresentationException,
     MissingValueForSerializationException,
@@ -115,7 +111,8 @@ def main(original_args=None):
 
     # commit and tag
     if vcs:
-        context = _commit_to_vcs(files, context, config_file, config_file_exists, vcs, args, current_version, new_version)
+        context = _commit_to_vcs(files, context, config_file, config_file_exists, vcs,
+                                 args, current_version, new_version)
         _tag_in_vcs(vcs, context, args)
 
 
@@ -245,21 +242,14 @@ def _load_configuration(config_file, explicit_config, defaults):
 
     logger.info("Reading config file %s:", config_file)
 
-    with io.open(config_file, "rt", encoding="utf-8") as config_fp:
+    with open(config_file, "rt", encoding="utf-8") as config_fp:
         config_content = config_fp.read()
         config_newlines = config_fp.newlines
 
     # TODO: this is a DEBUG level log
     logger.info(config_content)
-
-    try:
-        config.read_string(config_content)
-    except AttributeError:
-        # python 2 standard ConfigParser doesn't have read_string,
-        # only deprecated readfp
-        config.readfp(io.open(config_file, "rt", encoding="utf-8"))
-
-    log_config = StringIO()
+    config.read_string(config_content)
+    log_config = io.StringIO()
     config.write(log_config)
 
     if config.has_option("bumpversion", "files"):
@@ -339,7 +329,7 @@ def _load_configuration(config_file, explicit_config, defaults):
 
             if "serialize" not in section_config:
                 section_config["serialize"] = defaults.get(
-                    "serialize", [str("{major}.{minor}.{patch}")]
+                    "serialize", ["{major}.{minor}.{patch}"]
                 )
 
             if "search" not in section_config:
@@ -379,7 +369,7 @@ def _parse_arguments_phase_2(args, known_args, defaults, root_parser):
         metavar="FORMAT",
         action=DiscardDefaultIfSpecifiedAppendAction,
         help="How to format what is parsed back to a version",
-        default=defaults.get("serialize", [str("{major}.{minor}.{patch}")]),
+        default=defaults.get("serialize", ["{major}.{minor}.{patch}"]),
     )
     parser2.add_argument(
         "--search",
@@ -610,7 +600,7 @@ def _update_config_file(
         config, config_file, config_newlines, config_file_exists, new_version, dry_run,
 ):
     config.set("bumpversion", "current_version", new_version)
-    new_config = StringIO()
+    new_config = io.StringIO()
     try:
         write_to_config_file = (not dry_run) and config_file_exists
 
@@ -624,7 +614,7 @@ def _update_config_file(
         logger.info(new_config.getvalue())
 
         if write_to_config_file:
-            with io.open(config_file, "wt", encoding="utf-8", newline=config_newlines) as f:
+            with open(config_file, "wt", encoding="utf-8", newline=config_newlines) as f:
                 f.write(new_config.getvalue())
 
     except UnicodeEncodeError:
@@ -634,7 +624,8 @@ def _update_config_file(
         )
 
 
-def _commit_to_vcs(files, context, config_file, config_file_exists, vcs, args, current_version, new_version):
+def _commit_to_vcs(files, context, config_file, config_file_exists, vcs, args,
+                   current_version, new_version):
     commit_files = [f.path for f in files]
     if config_file_exists:
         commit_files.append(config_file)

bumpversion/compat.py

@@ -1,7 +1,7 @@
 import re
 
 
-class NumericFunction(object):
+class NumericFunction:
 
     """
     This is a class that provides a numeric function for version parts.
@@ -43,7 +43,7 @@ def bump(self, value):
         return "".join([part_prefix, str(bumped_numeric), part_suffix])
 
 
-class ValuesFunction(object):
+class ValuesFunction:
 
     """
     This is a class that provides a values list based function for version parts.
@@ -69,7 +69,7 @@ def __init__(self, values, optional_value=None, first_value=None):
 
         if optional_value not in values:
             raise ValueError(
-                "Optional value {0} must be included in values {1}".format(
+                "Optional value {} must be included in values {}".format(
                     optional_value, values
                 )
             )
@@ -81,7 +81,7 @@ def __init__(self, values, optional_value=None, first_value=None):
 
         if first_value not in values:
             raise ValueError(
-                "First value {0} must be included in values {1}".format(
+                "First value {} must be included in values {}".format(
                     first_value, values
                 )
             )

bumpversion/functions.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals, print_function
-
 from argparse import _AppendAction
 from difflib import unified_diff
 import io
@@ -23,7 +19,7 @@ def __call__(self, parser, namespace, values, option_string=None):
             setattr(namespace, self.dest, [])
             self._discarded_default = True  # pylint: disable=attribute-defined-outside-init
 
-        super(DiscardDefaultIfSpecifiedAppendAction, self).__call__(
+        super().__call__(
             parser, namespace, values, option_string=None
         )
 
@@ -36,7 +32,7 @@ def prefixed_environ():
     return {"${}".format(key): value for key, value in os.environ.items()}
 
 
-class ConfiguredFile(object):
+class ConfiguredFile:
     def __init__(self, path, versionconfig):
         self.path = path
         self._versionconfig = versionconfig
@@ -61,7 +57,7 @@ def should_contain_version(self, version, context):
         assert False, msg
 
     def contains(self, search):
-        with io.open(self.path, "rt", encoding="utf-8") as f:
+        with open(self.path, "rt", encoding="utf-8") as f:
             search_lines = search.splitlines()
             lookbehind = []
 
@@ -88,7 +84,7 @@ def contains(self, search):
 
     def replace(self, current_version, new_version, context, dry_run):
 
-        with io.open(self.path, "rt", encoding="utf-8") as f:
+        with open(self.path, "rt", encoding="utf-8") as f:
             file_content_before = f.read()
             file_new_lines = f.newlines
 
@@ -127,7 +123,7 @@ def replace(self, current_version, new_version, context, dry_run):
             logger.info("%s file %s", "Would not change" if dry_run else "Not changing", self.path)
 
         if not dry_run:
-            with io.open(self.path, "wt", encoding="utf-8", newline=file_new_lines) as f:
+            with open(self.path, "wt", encoding="utf-8", newline=file_new_lines) as f:
                 f.write(file_content_after)
 
     def __str__(self):