From 20b99ff376c4af5a12d5b505bace33ade2fa1923 Mon Sep 17 00:00:00 2001 From: Nalini Ganapati Date: Sun, 15 Dec 2024 23:21:00 -0800 Subject: [PATCH 1/5] Release v0.0.9.17 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 281826d..de6ca4a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-12, ubuntu-22.04] + os: [macos-13, ubuntu-22.04] env: INSTALL_PREFIX: ${{ github.workspace }}/prereqs MACOSX_DEPLOYMENT_TARGET: 12.1 From 57d0829d0e117f45c10f2bc6fdde7b1ed6f46534 Mon Sep 17 00:00:00 2001 From: Nalini Ganapati Date: Sun, 15 Dec 2024 23:28:03 -0800 Subject: [PATCH 2/5] Release v0.0.9.17 --- .github/workflows/release.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de6ca4a..6b7b436 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,7 +66,7 @@ jobs: build_macos_arm64_wheels: name: Build wheels for macOS arm64 needs: version_number - runs-on: macos-12 + runs-on: macos-13 env: INSTALL_PREFIX: ${{ github.workspace }}/prereqs_arm64 MACOSX_DEPLOYMENT_TARGET: 12.1 diff --git a/setup.py b/setup.py index 2bb55ef..5d8c4fb 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,7 @@ with_version = arg.split("=")[1] sys.argv.remove(arg) +print("GenomicsDB-Python Version={}".format(with_version)) print("Compiled GenomicsDB Install Path: {}".format(GENOMICSDB_INSTALL_PATH)) GENOMICSDB_INCLUDE_DIR = os.path.join(GENOMICSDB_INSTALL_PATH, "include") From 26e3967bc92b4d415c9bd6b1b98320fbfc270a3f Mon Sep 17 00:00:00 2001 From: Nalini Ganapati Date: Mon, 16 Dec 2024 09:02:21 -0800 Subject: [PATCH 3/5] Workaround version not being passed to setup.py by cibuildwheel for now --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 5d8c4fb..b4c648f 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ GENOMICSDB_INSTALL_PATH = os.getenv("GENOMICSDB_HOME", default="genomicsdb") copy_genomicsdb_libs = False copy_protobuf_definitions = False -with_version = "0.0.9.14" +with_version = "0.0.9.17" args = sys.argv[:] for arg in args: @@ -58,7 +58,6 @@ with_version = arg.split("=")[1] sys.argv.remove(arg) -print("GenomicsDB-Python Version={}".format(with_version)) print("Compiled GenomicsDB Install Path: {}".format(GENOMICSDB_INSTALL_PATH)) GENOMICSDB_INCLUDE_DIR = os.path.join(GENOMICSDB_INSTALL_PATH, "include") From f586a15cf8de233dee4625575ed53b52dc33e79c Mon Sep 17 00:00:00 2001 From: Nalini Ganapati Date: Mon, 16 Dec 2024 09:47:17 -0800 Subject: [PATCH 4/5] Using global-option instead of build-option arg with cibuildwheel for with-version --- .github/workflows/release.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b7b436..0203209 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: CIBW_BEFORE_BUILD: "pip install -r {package}/requirements_dev.txt && cd {package}" CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" CIBW_SKIP: "*musllinux*" - CIBW_CONFIG_SETTINGS: "--build-option=--with-version=${{ needs.version_number.outputs.version }} --build-option=--with-genomicsdb=${{ env.INSTALL_PREFIX }}" + CIBW_CONFIG_SETTINGS: "--global-option=--with-version=${{ needs.version_number.outputs.version }} --build-option=--with-genomicsdb=${{ env.INSTALL_PREFIX }}" CIBW_ENVIRONMENT: CMAKE_PREFIX_PATH=${{ env.INSTALL_PREFIX }} CIBW_ENVIRONMENT_MACOS: DYLD_LIBRARY_PATH=${{ env.INSTALL_PREFIX }}/lib CIBW_ENVIRONMENT_LINUX: > diff --git a/setup.py b/setup.py index b4c648f..2bb55ef 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ GENOMICSDB_INSTALL_PATH = os.getenv("GENOMICSDB_HOME", default="genomicsdb") copy_genomicsdb_libs = False copy_protobuf_definitions = False -with_version = "0.0.9.17" +with_version = "0.0.9.14" args = sys.argv[:] for arg in args: From 0079b010596ea8026621fb3b917c81275e2d34bd Mon Sep 17 00:00:00 2001 From: Nalini Ganapati Date: Mon, 16 Dec 2024 10:17:11 -0800 Subject: [PATCH 5/5] global-config change to cibuildwheel --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0203209..45791c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,7 +81,7 @@ jobs: CIBW_BEFORE_ALL: "OSX_ARCH='arm64' INSTALL_PREFIX=${{ env.INSTALL_PREFIX }} .github/scripts/install_prereqs.sh release" CIBW_BEFORE_BUILD: "pip install -r {package}/requirements_dev.txt && cd {package}" CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" - CIBW_CONFIG_SETTINGS: "--build-option=--with-version=${{ needs.version_number.outputs.version }} --build-option=--with-genomicsdb=${{ env.INSTALL_PREFIX }}" + CIBW_CONFIG_SETTINGS: "--global-option=--with-version=${{ needs.version_number.outputs.version }} --build-option=--with-genomicsdb=${{ env.INSTALL_PREFIX }}" CIBW_ENVIRONMENT: DYLD_LIBRARY_PATH=${{ env.INSTALL_PREFIX }}/lib - uses: actions/upload-artifact@v4