Skip to content

Commit

Permalink
Merge pull request #520 from sblauth/fix/2.3.1
Browse files Browse the repository at this point in the history
Minor patch 2.3.1
  • Loading branch information
sblauth authored Nov 13, 2024
2 parents f47d1b8 + 5fc10de commit ff29c61
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN micromamba install -y -n base -c conda-forge \
mpich \
scipy \
scotch"<7" \
python=3.11 && \
python=3.12 && \
micromamba clean --all --yes

ARG MAMBA_DOCKERFILE_ACTIVATE=1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- name: Checkout repository
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/tests_parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
mpi: [mpich, openmpi]
exclude:
- python-version: "3.8"
mpi: openmpi

steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_serial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- name: Checkout repository
Expand Down
7 changes: 4 additions & 3 deletions cashocs/geometry/mesh_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ def _remove_gmsh_parametrizations(mesh_file: str) -> None:
"""
temp_location = f"{mesh_file[:-4]}_temp.msh"
if fenics.MPI.rank(fenics.MPI.comm_world) == 0:
with open(mesh_file, "r", encoding="utf-8") as in_file, open(
temp_location, "w", encoding="utf-8"
) as temp_file:
with (
open(mesh_file, "r", encoding="utf-8") as in_file,
open(temp_location, "w", encoding="utf-8") as temp_file,
):
parametrizations_section = False

for line in in_file:
Expand Down
7 changes: 4 additions & 3 deletions cashocs/io/mesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,10 @@ def parse_file(
dim: The dimensionality of the mesh
"""
with open(original_msh_file, "r", encoding="utf-8") as old_file, open(
out_msh_file, "w", encoding="utf-8"
) as new_file:
with (
open(original_msh_file, "r", encoding="utf-8") as old_file,
open(out_msh_file, "w", encoding="utf-8") as new_file,
):
node_section = False
info_section = False
subnode_counter = 0
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_static/version_switcher.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
{
"name": "2.3 (stable)",
"version": "2.3.0",
"version": "2.3.1",
"url": "https://cashocs.readthedocs.io/en/stable/",
"preferred": true
},
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "cashocs"
version = "2.4.0-dev"
description = "Computational Adjoint-Based Shape Optimization and Optimal Control Software"
readme = "README.rst"
requires-python = ">=3.8"
requires-python = ">=3.9"
license = {text = "GNU General Public License v3 or later (GPLv3+)"}
authors = [
{name = "Sebastian Blauth"},
Expand All @@ -34,7 +34,6 @@ classifiers = [
"Intended Audience :: End Users/Desktop",
"Intended Audience :: Science/Research",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand Down

0 comments on commit ff29c61

Please sign in to comment.