Update CI platforms and depenencies.

Use extras_require.test to install test dependencies.

Following the convention established by ROS infrastructure packages I've
left coverage out of the required test dependencies so it is still
installed explicitly for the GitHub action.

Add extras_require.test and pin flake8 < 5.

flake8 5 removes the API being used for configuration.
It's unclear to me as of yet whether it is possible to make this setup
work for both Flake8 <5 and Flake8 5. The ROS infra team has not tackled
this yet.

In the meantime, let's try to get the workflow going again using flake8
4.

Also removes the variable indirection for installs_require since it
isn't used to do anything at the moment.

Quote all python versions in yaml.

Python 3.1 != Python 3.10

Update python versions tested in CI.

Author: nuclearsandwich

.github/workflows/ci.yml

@@ -12,12 +12,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
         include:
         - os: macos-latest
-          python-version: 3.8
+          python-version: "3.10"
         - os: windows-latest
-          python-version: 3.8
+          python-version: "3.8"
+        - os: windows-latest
+          python-version: "3.10"
 
     steps:
     - uses: actions/checkout@v2
@@ -35,7 +37,8 @@ jobs:
       if: matrix.os == 'macos-latest'
     - name: Test with pytest
       run: |
-        pip install --upgrade coverage flake8 flake8-docstrings flake8-import-order pytest
+        pip install --upgrade .[test]
+        pip install --upgrade coverage
         git config --global --add init.defaultBranch master
         git config --global --add advice.detachedHead true
         ${{ matrix.os == 'windows-latest' && 'set PYTHONPATH=%cd% &&' || 'PYTHONPATH=`pwd`' }} pytest -s -v test

setup.py

@@ -2,12 +2,21 @@
 from setuptools import setup
 from vcstool import __version__
 
-install_requires = ['PyYAML', 'setuptools']
-
 setup(
     name='vcstool',
     version=__version__,
-    install_requires=install_requires,
+    install_requires=[
+        'PyYAML',
+        'setuptools'],
+    extras_require={
+        'test': [
+            'flake8 >= 3.7, < 5',
+            'flake8-docstrings',
+            'flake8-import-order',
+            'pycodestyle < 2.9.0',
+            'pyflakes < 2.5.0',
+            'pytest']
+        },
     packages=find_packages(),
     author='Dirk Thomas',
     author_email='web@dirk-thomas.net',