Merge branch 'devel' of git@github.com:DLR-AE/LoadsKernel.git into devel

DLR-AE · May 21, 2024 · 445a42b · 445a42b
2 parents 153f666 + 2e0d9e4
commit 445a42b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
       # Add multiple Python versions here to run tests on new(er) versions.
-        python-version: ["3.10"]
+        python-version: ["3.10", "3.11"]
       fail-fast: false
     steps:
     - uses: actions/checkout@v3
@@ -64,7 +64,7 @@ jobs:
         conda activate
         conda install -y -c conda-forge --file ./tests/list_of_packages.txt || true
         # Install with -e (in editable mode) to allow the tracking of the test coverage
-        pip install -e .[extras]
+        pip install -e .[extras,test]
         # Check result of installation
         python -c "import loadskernel"
         python -c "import loadscompare"

diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         # Add multiple Python versions here to run tests on new(er) versions.
-        python-version: ["3.10"]
+        python-version: ["3.11"]
     # Step 1 to make GUIs work, see https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html
     env:
       DISPLAY: ':99.0'
@@ -64,7 +64,7 @@ jobs:
     strategy:
       matrix:
         # Select Python version to be used for compiling here.
-        python-version: ["3.10"]
+        python-version: ["3.11"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@ def my_setup():
           include_package_data=True,
           package_data={'loadskernel': ['graphics/*.*'],
                         'loadscompare': ['graphics/*.*'], },
-          python_requires='>=3.8',
+          python_requires='>=3.10',
           install_requires=['PanelAero',
                             'matplotlib',
                             'numpy',
@@ -46,13 +46,16 @@ def my_setup():
                                      'traits',
                                      'traitsui',
                                      'pyface',
-                                     'pyiges',
+                                     'jupyter',
+                                     'pyiges',  # only available with pip, not with conda
                                      ],
-                          'difficult': ['pyfmi'],
+                          'difficult': ['pyfmi',  # frequent version conflicts
+                                        ],
                           'test': ['pytest',
                                    'pytest-cov',
-                                   'jupyter',
                                    'jupyter-book==0.15.1',  # version 1.0.0 fails, wait for updates
+                                   'flake8',
+                                   'pylint',
                                    ]},
           )
 

diff --git a/tests/list_of_packages.txt b/tests/list_of_packages.txt
@@ -11,17 +11,17 @@ pytables
 pyyaml
 pandas
 
-# Extras, otional
+# Extras, optional
 mpi4py
 mayavi
 traits
 traitsui
 pyface
+jupyter
 
 # Regression tests
 pytest
 pytest-cov
-jupyter
 jupyter-book
 
 # Coding style