Skip to content

Commit

Permalink
Merge branch 'main' into defect_operational_domain_algorithm
Browse files Browse the repository at this point in the history
  • Loading branch information
Drewniok authored Jan 13, 2025
2 parents 8766509 + 96ab05d commit eaee609
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 21 deletions.
21 changes: 11 additions & 10 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,30 @@ jobs:
build_and_test:
strategy:
matrix:
os: [macos-13, macos-14]
compiler: [g++-12, g++-13, g++-14, clang++]
os: [macos-13, macos-14, macos-15]
compiler: [g++-13, g++-14, clang++]
include:
- os: macos-13
architecture: x64
- os: macos-14
architecture: arm64
- os: macos-15
architecture: arm64
- compiler: clang++
ccompiler: clang
- compiler: g++-12
ccompiler: gcc-12
- compiler: g++-13
ccompiler: gcc-13
- compiler: g++-14
ccompiler: gcc-14
exclude:
- os: macos-14
compiler: g++-12
- os: macos-14
compiler: g++-13
- os: macos-14
compiler: g++-14
- os: macos-15
compiler: g++-13
- os: macos-15
compiler: g++-14

name: 🍎 ${{matrix.os}} with ${{matrix.compiler}}
runs-on: ${{matrix.os}}
Expand All @@ -75,7 +77,8 @@ jobs:
with:
python-version: "3.13.x"

# Setup TBB for parallel STL algorithms via Homebrew
# etup TBB for parallel STL algorithms via Homebrew

- name: Setup TBB
run: brew install tbb

Expand Down Expand Up @@ -104,7 +107,6 @@ jobs:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

# Build and test pipeline for Debug mode

- name: Create Build Environment (Debug)
run: cmake -E make_directory ${{github.workspace}}/build_debug

Expand All @@ -131,10 +133,9 @@ jobs:

- name: Test (Debug)
working-directory: ${{github.workspace}}/build_debug
run: ctest -C Debug --verbose --output-on-failure --repeat until-pass:3 --parallel 4 --exclude-regex "quality"
run: ctest -C Debug --verbose --output-on-failure --repeat until-pass:3 --parallel 4

# Build and test pipeline for Release mode

- name: Create Build Environment (Release)
run: cmake -E make_directory ${{github.workspace}}/build_release

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
strategy:
fail-fast: false
matrix:
runs-on: [ubuntu-latest, macos-13, macos-14, windows-latest]
runs-on: [ubuntu-latest, macos-13, macos-15, windows-latest]
steps:
- name: Clone Repository
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 @@ -55,7 +55,7 @@ repos:

# Python linting using ruff
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.6
rev: v0.9.1
hooks:
- id: ruff
args: ["--fix", "--show-fixes"]
Expand Down Expand Up @@ -83,7 +83,7 @@ repos:

# Check JSON schemata
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.30.0
rev: 0.31.0
hooks:
- id: check-github-workflows
- id: check-readthedocs
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ submodules:
recursive: true

build:
os: ubuntu-22.04
os: ubuntu-24.04
tools:
python: "3.10"
python: "3.12"
apt_packages:
- cmake
jobs:
Expand Down
2 changes: 1 addition & 1 deletion docs/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ them automatically. Should the repository have been cloned before, the commands:
git submodule update --init --recursive

will fetch the latest version of all external modules used. Additionally, only ``CMake`` and a C++17 compiler are
required for the C++ part. If you want to work with the Python bindings, you need a Python 3.8+ installation.
required for the C++ part. If you want to work with the Python bindings, you need a Python 3.9+ installation.

At the time of writing, for parallel STL algorithms to work when using GCC, the TBB library (``libtbb-dev`` on Ubuntu) is
needed. It is an optional dependency that can be installed for a performance boost in certain scenarios. For your
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

nox.options.sessions = ["lint", "tests", "minimums"]

PYTHON_ALL_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12"]
PYTHON_ALL_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]

# The following lists all the build requirements for building the package.
# Note that this includes transitive build dependencies of package dependencies,
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ classifiers = [
'Development Status :: 4 - Beta',
'Programming Language :: Python :: 3',
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand All @@ -41,7 +40,7 @@ classifiers = [
'Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)',
]

requires-python = ">=3.8"
requires-python = ">=3.9"
dependencies = [
"z3-solver>=4.8.0"
]
Expand Down Expand Up @@ -180,7 +179,6 @@ reinstall-package = ["mnt.pyfiction"]
[tool.mypy]
files = ["bindings/mnt/pyfiction", "noxfile.py"]
mypy_path = ["$MYPY_CONFIG_FILE_DIR/bindings"]
python_version = "3.8"
warn_unused_configs = true
enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
strict = true
Expand Down

0 comments on commit eaee609

Please sign in to comment.