Drop support for Python 3.6

.github/workflows/install-git-url.yml

@@ -25,18 +25,13 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python-version:
-          - '3.6'
           - '3.7'
           - '3.8'
           - '3.9'
           - '3.10'
-          - 'pypy-3.6'
           - 'pypy-3.7'
           - 'pypy-3.8'
           - 'pypy-3.9'
-        exclude:
-          - os: macos-latest
-            python-version: 'pypy-3.6'
     steps:
       - name: Check out repository
         uses: actions/checkout@v3

.github/workflows/install-zip-url.yml

@@ -25,18 +25,13 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python-version:
-          - '3.6'
           - '3.7'
           - '3.8'
           - '3.9'
           - '3.10'
-          - 'pypy-3.6'
           - 'pypy-3.7'
           - 'pypy-3.8'
           - 'pypy-3.9'
-        exclude:
-          - os: macos-latest
-            python-version: 'pypy-3.6'
     steps:
       - name: Check out repository
         uses: actions/checkout@v3

.github/workflows/test.yml

@@ -21,29 +21,24 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python-version:
-          - '3.6'
           - '3.7'
           - '3.8'
           - '3.9'
           - '3.10'
-          - 'pypy-3.6'
           - 'pypy-3.7'
           - 'pypy-3.8'
           - 'pypy-3.9'
         toxenv: [py]
         include:
-          - python-version: '3.6'
+          - python-version: '3.7'
             toxenv: lint
             os: ubuntu-latest
-          - python-version: '3.6'
+          - python-version: '3.7'
             toxenv: typing
             os: ubuntu-latest
           - python-version: '3.7'
             toxenv: py-oldsetup
             os: ubuntu-latest
-        exclude:
-          - os: macos-latest
-            python-version: 'pypy-3.6'
     steps:
       - name: Check out repository
         uses: actions/checkout@v3

.github/workflows/tools/minimum-vcs/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-buster
+FROM python:3.7-buster
 RUN set -ex; \
     cd tmp; \
     wget http://snapshot.debian.org/archive/debian/20121102T092448Z/pool/main/g/git/git-man_1.8.0-1_all.deb; \

.github/workflows/tools/no-vcs/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-slim
+FROM python:3.7-slim
 RUN set -ex; \
     pip install --upgrade pip wheel; \
     pip install --upgrade --upgrade-strategy=eager tox

CHANGELOG.md

@@ -1,3 +1,7 @@
+v2.1.0 (in development)
+-----------------------
+- Drop support for Python 3.6
+
 v2.0.1 (2022-08-01)
 -------------------
 - Don't run the `onbuild` step under setuptools' upcoming PEP 660 editable mode

README.rst

@@ -67,7 +67,7 @@ calculation.
 
 Installation & Setup
 ====================
-``versioningit`` requires Python 3.6 or higher.  Just use `pip
+``versioningit`` requires Python 3.7 or higher.  Just use `pip
 <https://pip.pypa.io>`_ for Python 3 (You have pip, right?) to install
 ``versioningit`` and its dependencies::
 

docs/changelog.rst

@@ -3,6 +3,11 @@
 Changelog
 =========
 
+v2.1.0 (in development)
+-----------------------
+- Drop support for Python 3.6
+
+
 v2.0.1 (2022-08-01)
 -------------------
 - Don't run the ``onbuild`` step under setuptools' upcoming PEP 660 editable

docs/index.rst

@@ -61,7 +61,7 @@ calculation.
 
 Installation & Setup
 ====================
-``versioningit`` requires Python 3.6 or higher.  Just use `pip
+``versioningit`` requires Python 3.7 or higher.  Just use `pip
 <https://pip.pypa.io>`_ for Python 3 (You have pip, right?) to install
 ``versioningit`` and its dependencies::
 

setup.cfg

@@ -22,7 +22,6 @@ classifiers =
     Development Status :: 5 - Production/Stable
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -48,9 +47,8 @@ packages = find:
 package_dir =
     =src
 include_package_data = True
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
-    dataclasses; python_version < "3.7"
     importlib-metadata >= 3.6; python_version < "3.10"
     packaging >= 17.1
     tomli >= 1.2, < 3.0

src/versioningit/__init__.py

@@ -38,7 +38,7 @@
 <https://versioningit.rtfd.io> for more information.
 """
 
-__version__ = "2.0.1"
+__version__ = "2.1.0.dev1"
 __author__ = "John Thorvald Wodder II"
 __author_email__ = "[email protected]"
 __license__ = "MIT"

src/versioningit/util.py

@@ -66,7 +66,7 @@ def runcmd(*args: Union[str, Path], **kwargs: Any) -> subprocess.CompletedProces
 
 def readcmd(*args: Union[str, Path], **kwargs: Any) -> str:
     """Run a command, capturing & returning its stdout"""
-    s = runcmd(*args, stdout=subprocess.PIPE, universal_newlines=True, **kwargs).stdout
+    s = runcmd(*args, stdout=subprocess.PIPE, text=True, **kwargs).stdout
     assert isinstance(s, str)
     return s.strip()
 

test/test_end2end.py

@@ -238,7 +238,7 @@ def test_end2end_error(tmp_path: Path, repozip: Path, details: ErrorDetails) ->
         [sys.executable, "-m", "build", "--no-isolation", str(tmp_path)],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
-        universal_newlines=True,
+        text=True,
     )
     assert r.returncode != 0
     out = r.stdout
@@ -254,7 +254,7 @@ def test_end2end_version_not_found(tmp_path: Path, zipname: str) -> None:
         [sys.executable, "-m", "build", "--no-isolation", str(tmp_path)],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
-        universal_newlines=True,
+        text=True,
     )
     assert r.returncode != 0
     out = r.stdout

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = lint,typing,py36,py37,py38,py39,py310,pypy3,py-oldsetup
+envlist = lint,typing,py37,py38,py39,py310,pypy3,py-oldsetup
 skip_missing_interpreters = True
 isolated_build = True
 minversion = 3.3.0
@@ -43,7 +43,6 @@ commands =
 [testenv:typing]
 deps =
     mypy~=0.900
-    types-dataclasses; python_version < "3.7"
     types-setuptools
     {[testenv]deps}
 commands =