From 9027f0701f563136c7fe8e3f6972f238d66d31a3 Mon Sep 17 00:00:00 2001 From: burgholzer Date: Thu, 10 Oct 2024 11:47:22 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A7=20update=20release=20drafter?= =?UTF-8?q?=20template=20and=20renovate=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: burgholzer --- .github/release-drafter.yml | 12 +++++------- .github/renovate.json5 | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index e48cf8d9..33786999 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -6,6 +6,7 @@ categories: - "feature" - "enhancement" - "usability" + - "refactor" - title: "๐Ÿ› Bug Fixes" labels: - "bug" @@ -13,21 +14,22 @@ categories: - title: "๐Ÿ“„ Documentation" labels: - "documentation" - - title: "๐Ÿค– CI" - labels: - - "continuous integration" - title: "๐Ÿ“ฆ Packaging" labels: - "packaging" - title: "๐Ÿงน Code Quality" labels: - "code quality" + - title: "๐Ÿค– CI" + labels: + - "continuous integration" - title: "โฌ†๏ธ Dependencies" collapse-after: 5 labels: - "dependencies" - "submodules" - "github_actions" + - "pre-commit" change-template: "- $TITLE @$AUTHOR (#$NUMBER)" change-title-escapes: '\<*_&' version-resolver: @@ -41,10 +43,6 @@ version-resolver: labels: - "patch" default: patch -autolabeler: - - label: "dependencies" - title: - - "/update pre-commit hooks/i" template: | ## ๐Ÿ‘€ What Changed diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 2b27553b..b8df4270 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -16,7 +16,7 @@ packageRules: [ { matchManagers: ["github-actions"], - addLabels: ["github-actions", "continuous integration"], + addLabels: ["github-actions"], commitMessagePrefix: "โฌ†\uFE0F\uD83D\uDC68\u200D\uD83D\uDCBB" }, { @@ -26,7 +26,7 @@ }, { matchManagers: ["pre-commit"], - addLabels: ["pre-commit", "continuous integration"], + addLabels: ["pre-commit"], commitMessagePrefix: "โฌ†\uFE0F\uD83E\uDE9D", }, { From f5418977bc678a4cc33d180a41ffc6e94c078aef Mon Sep 17 00:00:00 2001 From: burgholzer Date: Thu, 10 Oct 2024 11:48:57 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=94=A7=F0=9F=93=9D=20unshallow=20git?= =?UTF-8?q?=20clone=20for=20RtD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: burgholzer --- .readthedocs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c450feb8..f943940b 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -20,6 +20,8 @@ build: then exit 183; fi + # Unshallow the git clone and fetch tags to get proper version information + - git fetch --unshallow --tags sphinx: configuration: docs/conf.py From 1e6201a7e50dfbf1167782199a0682ed657c2eaa Mon Sep 17 00:00:00 2001 From: burgholzer Date: Thu, 10 Oct 2024 11:50:33 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A7=20use=20separate=20build=20dir?= =?UTF-8?q?ectories=20per=20Python=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: burgholzer --- noxfile.py | 2 +- pyproject.toml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/noxfile.py b/noxfile.py index 136bda33..906dacd0 100644 --- a/noxfile.py +++ b/noxfile.py @@ -54,7 +54,7 @@ def _run_tests( posargs = list(session.posargs) env = {} if os.environ.get("CI", None) and sys.platform == "win32": - env["SKBUILD_CMAKE_ARGS"] = "-T ClangCL;--fresh" + env["SKBUILD_CMAKE_ARGS"] = "-T ClangCL" if shutil.which("cmake") is None and shutil.which("cmake3") is None: session.install("cmake") diff --git a/pyproject.toml b/pyproject.toml index c6b69be7..03ddd878 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -85,14 +85,14 @@ minimum-version = "build-system.requires" # Set the wheel install directory wheel.install-dir = "mqt/ddsim" +# Explicitly set the package directory +wheel.packages = ["src/mqt"] + # Set required Ninja version ninja.version = ">=1.10" # Setuptools-style build caching in a local directory -build-dir = "build/{build_type}" - -# Explicitly set the package directory -wheel.packages = ["src/mqt"] +build-dir = "build/{wheel_tag}/{build_type}" # Only build the Python bindings target build.targets = ["pyddsim"] @@ -301,7 +301,7 @@ environment = { MACOSX_DEPLOYMENT_TARGET = "10.15" } [tool.cibuildwheel.windows] before-build = "pip install delvewheel>=1.7.3" repair-wheel-command = "delvewheel repair -v -w {dest_dir} {wheel} --namespace-pkg mqt" -environment = { CMAKE_ARGS = "-T ClangCL", SKBUILD_CMAKE_ARGS="--fresh" } +environment = { CMAKE_ARGS = "-T ClangCL" } [[tool.cibuildwheel.overrides]] select = "*-macosx_arm64"