Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/actions/build-py/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ runs:
/opt/python/cp38-cp38/bin/python -m pip install --upgrade pip setuptools wheel
/opt/python/cp38-cp38/bin/python -m pip install scikit-build scikit-build-core
/opt/python/cp38-cp38/bin/python -m build --no-isolation --wheel
/opt/python/cp311-cp311/bin/python -m pip install --upgrade pip setuptools wheel
/opt/python/cp311-cp311/bin/python -m pip install scikit-build scikit-build-core
/opt/python/cp311-cp311/bin/python -m build --no-isolation --wheel
/opt/python/cp312-cp312/bin/python -m pip install --upgrade pip setuptools wheel
/opt/python/cp312-cp312/bin/python -m pip install scikit-build scikit-build-core
/opt/python/cp312-cp312/bin/python -m build --no-isolation --wheel
# Exclude memilio-generation, because its a pure python package, cmake is only used in the build process to retrieve data from cpp
if [[ -f "CMakeLists.txt" ]] && [ "${{ inputs.package }}" != "generation" ]; then
# includes native dependencies in the wheel
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test-py/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
else
sudo apt-get -qq -y install python3-pip gnupg
fi
python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools
- name: Download Python Wheels
uses: actions/download-artifact@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/test-pylint/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ runs:
sudo apt-get -qq update
sudo apt-get -qq -y install python3-pip gnupg
python -m pip install --upgrade pip
# Pylint runs against the prebuilt wheels in pycode/wheelhouse/*cp311*.
# Pylint runs against the prebuilt wheels in pycode/wheelhouse/*cp312*.
# So, use current latest supported Python version.
- name: Set up Python 3.11
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"
- name: Download Python Wheels
uses: actions/download-artifact@v4
with:
Expand All @@ -28,7 +28,7 @@ runs:
shell: bash
run: |
shopt -s nullglob
for pkg in pycode/wheelhouse/*cp311*.whl; do python -m pip install "$pkg"; done # packages that contain native extensions are version specific
for pkg in pycode/wheelhouse/*cp312*.whl; do python -m pip install "$pkg"; done # packages that contain native extensions are version specific
for pkg in pycode/wheelhouse/*py3*.whl; do python -m pip install "$pkg"; done # pure python packages are not version specific
python -m pip install --upgrade-strategy only-if-needed --prefer-binary --find-links pycode/wheelhouse "memilio-${{ inputs.package }}[dev]"
- name: Run pylint
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/epidata_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12
- uses: pre-commit/action@v3.0.1

build-py-epidata:
Expand All @@ -51,7 +51,7 @@ jobs:
needs: build-py-epidata
strategy:
matrix:
version: ["3.8", "3.11"]
version: ["3.8", "3.12"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -66,7 +66,7 @@ jobs:
needs: [build-py-plot, build-py-epidata]
strategy:
matrix:
version: ["3.8", "3.11"]
version: ["3.8", "3.12"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -123,13 +123,13 @@ jobs:
with:
name: python-wheels-epidata
path: pycode/wheelhouse
- name: Set up Python 3.11
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12
- name: Install Python Wheels
run: |
for pkg in `ls pycode/wheelhouse/*cp311*.whl`; do python -m pip install $pkg; done # packages that contain native extensions are version specific
for pkg in `ls pycode/wheelhouse/*cp312*.whl`; do python -m pip install $pkg; done # packages that contain native extensions are version specific
for pkg in `ls pycode/wheelhouse/*py3*.whl`; do python -m pip install $pkg; done # pure python packages are not version specific
- name: Download Data
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12
- uses: pre-commit/action@v3.0.1

build-cpp-gcc_clang:
Expand Down Expand Up @@ -291,7 +291,7 @@ jobs:
if: github.event.pull_request.draft == false
strategy:
matrix:
version: ["3.8", "3.11"]
version: ["3.8", "3.12"]
needs: build-py-generation
runs-on: ubuntu-latest
steps:
Expand All @@ -305,7 +305,7 @@ jobs:
needs: build-py-simulation
strategy:
matrix:
version: ["3.8", "3.11"]
version: ["3.8", "3.12"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -318,7 +318,7 @@ jobs:
needs: [build-py-surrogatemodel, build-py-simulation]
strategy:
matrix:
version: ["3.8", "3.11"]
version: ["3.8", "3.12"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
hooks:
- id: pyupgrade
args: [--py37-plus]
- repo: https://github.com/pre-commit/mirrors-autopep8
rev: v2.0.0
- repo: https://github.com/hhatto/autopep8
rev: v2.3.2
hooks:
- id: autopep8
2 changes: 1 addition & 1 deletion docs/source/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Before you can install MEmilio, you need to install some common development tool

* **Python:** Required for the Python packages.

* MEmilio is tested daily with Python 3.8 and 3.11. While other versions may also work, we recommend using the latest release of either of these. You can download it from the official website `python.org <https://www.python.org/>`__.
* MEmilio is tested daily with Python 3.8 and 3.12. While other versions may also work, we recommend using the latest release of either of these. You can download it from the official website `python.org <https://www.python.org/>`__.

* **C++ Compiler and CMake:**

Expand Down
2 changes: 1 addition & 1 deletion pycode/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ We recommend to use a virtual python environment to avoid dependency conflicts w

Refer to the `Python documentation <https://docs.python.org/3/library/venv.html>`_ for more information about virtual environments.

The packages are tested for Python 3.8 - 3.11.
The packages are tested for Python 3.8 - 3.12.
6 changes: 3 additions & 3 deletions pycode/memilio-epidata/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ maintainers = [
{ email = "martin.kuehn@dlr.de" }
]
dependencies = [
"setuptools>=68",
"pandas>=2.0.0",
"pyarrow",
"matplotlib",
Expand Down Expand Up @@ -41,9 +42,8 @@ dependencies = [
[project.optional-dependencies]
dev = [
"coverage>=7.0.1",
# pylint 2.16 creates problem with wrapt package version
"pylint>=2.13.0,<2.16",
"pylint_json2html==0.4.0"
"pylint>=3.0",
"pylint_json2html==0.5.0"
]

[project.scripts]
Expand Down
6 changes: 3 additions & 3 deletions pycode/memilio-plot/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ maintainers = [
{ email = "martin.kuehn@dlr.de" }
]
dependencies = [
"setuptools>=68",
"pandas>=1.2.2",
"matplotlib",
# smaller numpy versions cause a security issue, 1.25 does not work together with pyfakefs
Expand All @@ -36,9 +37,8 @@ dependencies = [
[project.optional-dependencies]
dev = [
"coverage>=7.0.1",
# pylint 2.16 creates problem with wrapt package version
"pylint>=2.13.0,<2.16",
"pylint_json2html==0.4.0"
"pylint>=3.0",
"pylint_json2html==0.5.0"
]

[project.urls]
Expand Down
Loading