modernize testing a bit

aaronliu0130 · aaronliu0130 · commit acc2d971ff6a · 2024-02-04T12:52:10.000-05:00
shy away from using dperecated setup.py subcommands
update dependencies and remove unneeded legacy stuff
make pytest have color outputs and do deprecation warnings
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,10 +23,11 @@ jobs:
           python-version: ${{ matrix.python-version }}
           architecture: x64
           cache: 'pip'
-          cache-dependency-path: '**/dev-requirements'
+          cache-dependency-path: '**/test-requirements'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install -e .[dev]
+          python -m pip install 'tox-gh-actions<4.0.0'
       - name: Test with tox
         run: tox
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -76,11 +76,11 @@ The release process first prepares the documentation, then publishes to testpypi
     vi changelog.rst # log changes
     git add cpplint.py changelog.rst
     git commit -m "Releasing x.y.z"
-    # test-release (on env by mkvirtualenv -p /usr/bin/python3)
-    pip install --upgrade wheel twine
+    # Build
+    pip install --upgrade build wheel twine
     rm -rf dist
+    python -m build --sdist --wheel
     # Test release, requires account on testpypi
-    python3 setup.py sdist bdist_wheel
     twine upload --repository testpypi dist/*
     # ... Check website and downloads from https://test.pypi.org/project/cpplint/
     # Actual release
diff --git a/changelog.rst b/changelog.rst
@@ -7,7 +7,7 @@ Changelog
 A bunch of long-overdue modernizations of the codebase!
 
 * Python 2 is no longer supported. Python 3.7 and 3.12 support was added, courtesy of @jayvdb
-  * We still have yet to switch from the old setup.py distribution mechanism, so we're staying on an old version of setuptools for now. As a result of all this, setup.py's lint subcommand was removed
+  * As a result of all this, setup.py's lint subcommand was removed. Please run the commands directly instead.
 * NOLINT and NOLINTNEXTLINE comments now support a comma-separated list of categories, courtesy of @n3world (https://github.com/cpplint/cpplint/pull/220)
 * The `--filter` option can now be only applied to a specific file or even a specific line through utilizing colons, e.g. `-filter=-whitespace:foo.h,+whitespace/braces:foo.h:418`. Courtesy of @PhilLab (https://github.com/cpplint/cpplint/pull/171)
 * NOLINT and NOLINTNEXTLINE will now ignore categories known to be from clang-tidy thanks to @xatier (https://github.com/cpplint/cpplint/pull/231)
diff --git a/dev-requirements b/dev-requirements
@@ -2,9 +2,6 @@
 
 # also change in tox.ini
 flake8>=4.0.1
-flake8-polyfill
 pylint>=2.11.0
-tox<5.0.0
-tox-gh-actions<4.0.0
 importlib-metadata>=0.12
-setuptools==58.2.0
+setuptools
diff --git a/setup.cfg b/setup.cfg
@@ -5,6 +5,4 @@ test = pytest
 python_files = *test.py
 testpaths = .
 # running with tox reports only 75%
-addopts = --cov-fail-under=75 --cov=cpplint
-filterwarnings =
-    ignore:.*:DeprecationWarning
+addopts = --cov-fail-under=75 --cov=cpplint --color=yes
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 from setuptools import setup
-import cpplint as cpplint
+import cpplint
 
 # some pip versions bark on comments (e.g. on travis)
 def read_without_comments(filename):
diff --git a/test-requirements b/test-requirements
@@ -1,5 +1,7 @@
-# minimal requirements to run python setup.py test
-# 5.x requires python 3.5
+# requirements for testing steps
+tox<5.0.0
+
+# also change in tox.ini
 pytest
 pytest-cov
 testfixtures
diff --git a/tox.ini b/tox.ini
@@ -19,7 +19,7 @@ deps =
   pytest
   pytest-cov
   testfixtures
-  setuptools==58.2.0
+  setuptools
 
 commands =
   {envpython} -m pytest
