Merge pull request #31 from jguiditta/ci_changes

Update github action versions.
release-depot · Feb 3, 2023 · d81ca9a · d81ca9a
2 parents f7fc070 + a9a4f21
commit d81ca9a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 51 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,11 +8,11 @@ jobs:
       runs-on: ubuntu-latest
       strategy:
         matrix:
-          python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+          python: ['3.7', '3.8', '3.9', '3.10', '3.11']
       steps:
-        - uses: actions/checkout@v2
+        - uses: actions/checkout@v3
         - name: Setup Python
-          uses: actions/setup-python@v2
+          uses: actions/setup-python@v4
           with:
             python-version: ${{ matrix.python }}
         - name: Install Tox and any other packages
@@ -24,11 +24,11 @@ jobs:
     flake8:
       runs-on: ubuntu-latest
       steps:
-        - uses: actions/checkout@v2
+        - uses: actions/checkout@v3
         - name: Setup Python
-          uses: actions/setup-python@v2
+          uses: actions/setup-python@v4
           with:
-            python-version: "3.10"
+            python-version: 3.11
         - name: Install Tox and any other packages
           run: |
             python -m pip install --upgrade pip
@@ -38,11 +38,11 @@ jobs:
     integration:
       runs-on: ubuntu-latest
       steps:
-        - uses: actions/checkout@v2
+        - uses: actions/checkout@v3
         - name: Setup Python
-          uses: actions/setup-python@v2
+          uses: actions/setup-python@v4
           with:
-            python-version: "3.10"
+            python-version: 3.11
         - name: Install Tox and any other packages
           run: |
             python -m pip install --upgrade pip

diff --git a/.mergify.yml b/.mergify.yml
diff --git a/setup.py b/setup.py
@@ -21,8 +21,6 @@
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
     ],
     description="DLRN custom pre-processing script to automatically rebase patches on top of incoming repo changes.",
     install_requires=requirements,

diff --git a/tox.ini b/tox.ini
@@ -1,33 +1,34 @@
 [tox]
 envlist = 
-    py{36,37,38,39,310}
+    py{37,38,39,310,311}
     flake8
 
 [testenv]
 passenv=HOME
 sitepackages = False
-setenv =
-    PYTHONPATH = {toxinidir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
-    pip install -U pip
-    py.test --cov-report=term-missing --cov=patch_rebaser tests
+    pytest --cov-report=term-missing --cov=patch_rebaser tests
 
 [testenv:flake8]
 passenv=HOME
 sitepackages = False
-basepython = python
-deps = flake8
 commands = flake8 patch_rebaser tests integration_tests
 
 [testenv:integration]
+allowlist_externals =
+    /usr/bin/find
+    /usr/bin/sudo
 commands =
     /usr/bin/find . -name '*.pyc' -delete  # Avoid issues with pytests conf file discovery
     /usr/bin/sudo docker build -t patch_rebaser_integration_tests .
     /usr/bin/sudo docker run patch_rebaser_integration_tests /bin/sh -c "pytest -k integration_tests integration_tests"  # Ensure we only run the integration tests
 
 [testenv:integration_podman]
+allowlist_externals =
+    /usr/bin/find
+    /usr/bin/podman
 commands =
     /usr/bin/find . -name '*.pyc' -delete  # Avoid issues with pytests conf file discovery
     /usr/bin/podman build -t patch_rebaser_integration_tests .