feat: adds support for Python 3.10.0

.github/workflows/pyslurm.yml

@@ -1,36 +1,43 @@
 name: PySlurm
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request: {}
 jobs:
   Build:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version:
-          - "3.6"
-          - "3.7"
-          - "3.8"
-          - "3.9"
+          - "3.6.15"
+          - "3.7.12"
+          - "3.8.12"
+          - "3.9.9"
+          - "3.10.0"
       fail-fast: false
     steps:
       - name: Checkout repository code
         uses: actions/checkout@v2
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+
       - name: Install Dependencies
         run: |
-          which python
-          which python${{ matrix.python-version }}
-          python${{ matrix.python-version }} -m pip install --upgrade pip
-          python${{ matrix.python-verison }} -m pip install pipenv
-          pipenv --python ${{matrix.python-version }} install --dev --skip-lock
+          python -m pip install --upgrade pip
+          python -m pip install pipenv
+          pipenv --python ${{ matrix.python-version }} install --dev --skip-lock
+
       - name: Start Slurm Container
         uses: sudo-bot/action-docker-compose@latest
         with:
           cli-args: "-f docker-compose-github.yml up -d"
         env:
           PYTHON: ${{ matrix.python-version }}
+
       - name: Debug
         run: |
           docker ps -a
@@ -39,9 +46,9 @@ jobs:
           ls -al
           docker inspect slurmctl
           env | sort
+
       - name: Build/Install/Test PySlurm
         run: |
           pipenv run pytest -sv scripts/run_tests_in_container.py
         env:
           PYTHON: ${{ matrix.python-version }}
-

docker-compose-github.yml

@@ -2,13 +2,11 @@ version: "3.8"
 
 services:
   slurm:
-    image: giovtorres/docker-centos7-slurm:20.11.8
+    image: giovtorres/docker-centos7-slurm:20.11.8-1
     hostname: slurmctl
     container_name: slurmctl
     stdin_open: true
     tty: true
     working_dir: /pyslurm
-    environment:
-      PYTHON: "3.9"
     volumes:
       - ${RUNNER_WORKSPACE}/pyslurm:/pyslurm

docker-compose.yml

@@ -2,13 +2,13 @@ version: "3.8"
 
 services:
   slurm:
-    image: giovtorres/docker-centos7-slurm:20.11.8
+    image: giovtorres/docker-centos7-slurm:20.11.8-1
     hostname: slurmctl
     container_name: slurmctl
     stdin_open: true
     tty: true
     working_dir: /pyslurm
-    environment:
-      PYTHON: "3.9"
+#    environment:
+#      PYTHON: "3.9"
     volumes:
       - ${PWD}:/pyslurm

scripts/run_tests_in_container.py

@@ -1,16 +1,19 @@
 """Execute pytest inside the container."""
 
 import os
+import sys
 
 import testinfra
 
 
 def test_run():
     host = testinfra.get_host(f"docker://slurmctl")
-    python = f'python{os.environ.get("PYTHON")}'
-    print(host.check_output(f"{python} setup.py build"))
-    print(host.check_output(f"{python} setup.py install"))
+    python_full = os.environ.get("PYTHON")
+    python_short = ".".join([str(sys.version_info.major), str(sys.version_info.minor)])
+    print(host.check_output(f"pyenv global {python_full}"))
+    print(host.check_output(f"python{python_short} setup.py build"))
+    print(host.check_output(f"python{python_short} setup.py install"))
     print(host.check_output("./scripts/configure.sh"))
-    print(host.check_output(f"{python} -m pip uninstall --yes pytest"))
-    print(host.check_output(f"{python} -m pip install pytest"))
+    print(host.check_output(f"python{python_short} -m pip uninstall --yes pytest"))
+    print(host.check_output(f"python{python_short} -m pip install pytest"))
     print(host.check_output("pytest -v"))