Drop Python 2.7, 3.5 and 3.6 support

Author: dolfinus

.github/workflows/release.yml

@@ -24,33 +24,30 @@ jobs:
       uses: cutenode/action-always-fail@v1
       if: steps.wait-for-tests.outputs.conclusion != 'success'
 
-  build:
-    name: Build package
+  release:
+    name: Release package
     runs-on: ubuntu-latest
     needs: [wait]
-    strategy:
-      matrix:
-        python-version: ['2.7', '3.10']
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
 
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python 3.10
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: 3.10
 
     - name: Cache pip
       uses: actions/cache@v2
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('requirements.txt') }}
+        key: ${{ runner.os }}-python-3.10-pip-${{ hashFiles('requirements.txt') }}
         restore-keys: |
-          ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('requirements.txt') }}
-          ${{ runner.os }}-python-${{ matrix.python-version }}-pip-
+          ${{ runner.os }}-python-3.10-pip-${{ hashFiles('requirements.txt') }}
+          ${{ runner.os }}-python-3.10-pip-
           ${{ runner.os }}-python
           ${{ runner.os }}-
 
@@ -63,39 +60,6 @@ jobs:
     - name: Build package
       run: python setup.py bdist_wheel sdist
 
-    - name: Upload coverage results
-      uses: actions/upload-artifact@v2
-      with:
-        name: dist-${{ matrix.python-version }}
-        path: dist/*
-
-  release:
-    name: Release package
-    runs-on: ubuntu-latest
-    needs: [build]
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.10'
-
-    - name: Upgrade pip
-      run: python -m pip install --upgrade pip setuptools wheel twine
-
-    - name: Download all coverage reports
-      uses: actions/download-artifact@v2
-      with:
-        path: dist_raw
-
-    - name: Move coverage reports to the root folder
-      run: |
-        mkdir dist
-        find dist_raw -type f -exec mv '{}' dist \;
-
     - name: Check package
       run: twine check dist/*
 

.github/workflows/test.yml

@@ -45,19 +45,6 @@ jobs:
         - os: windows-latest
           mark: important
           python-version: '3.10'
-        # TODO: drop old Python versions in v2.0 release
-        - os: ubuntu-18.04
-          mark: important
-          python-version: '2.7'
-        - os: ubuntu-18.04
-          mark: important
-          python-version: '3.5'
-        - os: ubuntu-18.04
-          mark: important
-          python-version: '3.6'
-        - os: ubuntu-18.04
-          mark: important
-          python-version: pypy-2.7
         # run all the tests only on latest python version
         - os: ubuntu-latest
           mark: all

.pre-commit-config.yaml

@@ -48,6 +48,7 @@ repos:
   rev: v2.31.1
   hooks:
   - id: pyupgrade
+    args: [--py37-plus]
 - repo: https://github.com/psf/black
   rev: 22.1.0
   hooks:

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
   "restructuredtext.confPath": "${workspaceFolder}/docs",
-  "esbonio.sphinx.confDir": "${workspaceFolder}/docs"
+  "esbonio.sphinx.confDir": "/home/maxim/Repo/setuptools-git-versioning/docs"
 }

CHANGELOG.rst

@@ -1,17 +1,30 @@
 Changelog
 ==========
 
-1.8
+2.0
 ----
 
 .. changelog::
-    :version: 1.8.2
+    :version: 2.0.0
+
+    .. change::
+        :tags: general, breaking
+
+        Drop Python 2.7, 3.5 and 3.6 support. Minimal supported Python version is now 3.7
+
+    .. change::
+        :tags: core, feature
+
+        Do not fail on ``toml`` and ``packaging`` modules import while installing ``setuptools-git-versioning`` from ``tag.gz`` file
 
     .. change::
         :tags: ci, bug
 
         Fix creating multiple releases for the same tag
 
+1.8
+----
+
 .. changelog::
     :version: 1.8.1
     :released: 10.01.2022

docs/conf.py

@@ -19,7 +19,7 @@
 sys.path.insert(0, str(Path(__file__).parent.parent.absolute()))
 ver = Version(
     subprocess.check_output(  # nosec
-        "{python} ../setup.py --version".format(python=sys.executable),
+        f"{sys.executable} ../setup.py --version",
         shell=True,
     )
     .decode("utf-8")
@@ -65,7 +65,7 @@
 # a list of builtin themes.
 #
 html_theme = "furo"
-html_title = "setuptools-git-versioning {version}".format(version=version)
+html_title = f"setuptools-git-versioning {version}"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

pyproject.toml

@@ -4,7 +4,7 @@ multi_line_output = 3
 
 [tool.black]
 line-length = 120
-target-version = ['py27', 'py35', 'py36', 'py37', 'py38', 'py39', 'py310']
+target-version = ['py37', 'py38', 'py39', 'py310']
 include = '\.pyi?$'
 exclude = '''(\.eggs|\.git|\.mypy_cache|\.tox|\.venv|_build|buck-out|build|dist)'''
 

requirements-test.txt

@@ -1,8 +1,6 @@
 build
 coverage
-flake8>=3.8; python_version=="2.7"
-flake8>=3.8; python_version>="3.5"
+flake8>=3.8
 pytest
-pytest-rerunfailures<9.0; python_version=="2.7"
-pytest-rerunfailures; python_version>="3.5"
+pytest-rerunfailures
 wheel

requirements.txt

@@ -1,5 +1,3 @@
 packaging
-setuptools; python_version>="3.5"
-setuptools<45.0; python_version<"3"
+setuptools
 toml>=0.10.2
-typing; python_version<"3"

setup.py

@@ -31,11 +31,7 @@ def parse_requirements(file_content):
     classifiers=[
         "Framework :: Setuptools Plugin",
         "Intended Audience :: Developers",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
@@ -50,7 +46,7 @@ def parse_requirements(file_content):
         "Coverage": "https://app.codecov.io/gh/dolfinus/setuptools-git-versioning",
         "Tracker": "https://github.com/dolfinus/setuptools-git-versioning/issues",
     },
-    python_requires=">=2.7,!=3.1,!=3.2,!=3.3,!=3.4",
+    python_requires=">=3.7",
     py_modules=["setuptools_git_versioning"],
     install_requires=requirements,
     entry_points={