Test Python 3.11, use Apptainer, test ubuntu-latest image. (#112)

.github/workflows/ubuntu.yml

@@ -9,11 +9,11 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        os: [ubuntu-latest]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set revision
       run: |
@@ -23,13 +23,13 @@ jobs:
     # Compile each Fast Downward revision only once and cache the results.
     - name: Cache revisions
       id: cache-revisions
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: revision-cache
         key: ${{ matrix.os }}-revision-cache-${{ env.GIT_DOWNWARD_REV }}
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -43,7 +43,7 @@ jobs:
         python -m pip install --upgrade pip tox
 
     - name: Check style
-      if: matrix.os == 'ubuntu-20.04' && matrix.python-version == '3.8'
+      if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10'
       run: |
         tox -e docs,style
 
@@ -81,12 +81,12 @@ jobs:
         popd
         rm -r runsolver-dir/
 
-    - name: Install Singularity
+    - name: Install Apptainer
       working-directory: ../deps
       run: |
-        wget --no-verbose https://www.ida.liu.se/~jense56/files/singularity-container_3.5.2+ds1-1_amd64.deb -O singularity.deb
-        sudo dpkg -i singularity.deb
-        rm singularity.deb
+        sudo add-apt-repository -y ppa:apptainer/ppa
+        sudo apt-get update
+        sudo apt-get install -y apptainer
 
     - name: Compile VAL
       working-directory: ../deps

examples/singularity/filter-stderr.py

@@ -13,6 +13,7 @@
     "differs from the one in the portfolio file",
     "Terminated",
     "Killed",
+    "underlay of /etc/localtime required more than",
 ]
 
 
@@ -22,7 +23,7 @@ def main():
     if stderr.is_file():
         need_to_filter = False
         filtered_content = []
-        with open(stderr, "r") as f:
+        with open(stderr) as f:
             for line in f:
                 if any(pattern in line for pattern in IGNORE_PATTERNS):
                     need_to_filter = True

setup.py

@@ -32,6 +32,7 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Scientific/Engineering",
     ],
     install_requires=[

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37, py38, py310, ff, singularity, style, docs  # Skip py39 since it chokes on distutils.
+envlist = py37, py38, py310, py311, ff, singularity, style, docs  # Skip py39 since it chokes on distutils.
 basepython = python3
 skip_missing_interpreters = true