Skip to content

Commit

Permalink
build new release with numpy=2.0; bump version v2.0a3
Browse files Browse the repository at this point in the history
  • Loading branch information
bpuchala committed Jul 12, 2024
1 parent e5272dd commit 89e7af9
Show file tree
Hide file tree
Showing 15 changed files with 86 additions and 31 deletions.
16 changes: 11 additions & 5 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build_and_store_wheels: &BUILD_AND_STORE_WHEELS
install_cibuildwheel_script:
- python -m pip install cibuildwheel==2.17.0
- python -m pip install cibuildwheel==2.19.2
run_cibuildwheel_script:
- cibuildwheel
wheels_artifacts:
Expand All @@ -16,17 +16,23 @@ linux_aarch64_task:
cpu: 4
memory: 4G
env:
CIBW_ARCHS_LINUX: aarch64
VENV_ROOT: ${HOME}/venv-cibuildwheel
PATH: ${VENV_ROOT}/bin:${PATH}
install_pre_requirements_script:
- apt install -y python3-venv python-is-python3
- add-apt-repository -y ppa:deadsnakes/ppa
- apt-get update
- apt-get install -y python3.12-venv
- python3.12 -m venv ${VENV_ROOT}
<<: *BUILD_AND_STORE_WHEELS

macos_arm64_task:
name: Build macOS arm64 wheels.
macos_instance:
image: ghcr.io/cirruslabs/macos-sonoma-xcode
env:
PATH: /opt/homebrew/opt/[email protected]/libexec/bin:$PATH
VENV_ROOT: ${HOME}/venv-cibuildwheel
PATH: ${VENV_ROOT}/bin:${PATH}
install_pre_requirements_script:
- brew install [email protected]
- brew install [email protected]
- python3.12 -m venv ${VENV_ROOT}
<<: *BUILD_AND_STORE_WHEELS
27 changes: 24 additions & 3 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Build wheels

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

jobs:
build_wheels_linux_x86_64:
Expand All @@ -20,7 +24,7 @@ jobs:
name: dist_linux
path: ./wheelhouse/*.whl

build_wheels_macos_x86_64:
build_wheels_macos12_x86_64:
name: Build x86_64 wheels on macos-12
runs-on: macos-12

Expand All @@ -34,7 +38,24 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: dist_macos
name: dist_macos12_x86_64
path: ./wheelhouse/*.whl

build_wheels_macos14_arm64:
name: Build arm64 wheels on macos-14
runs-on: macos-14

steps:
- uses: actions/checkout@v4

- name: Build wheels
uses: pypa/[email protected]
env:
CIBW_ARCHS_MACOS: arm64

- uses: actions/upload-artifact@v4
with:
name: dist_macos14_arm64
path: ./wheelhouse/*.whl

build_sdist:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test-linux-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing build on ubuntu-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

env:
SKBUILD_BUILD_OPTIONS: --verbose
Expand Down Expand Up @@ -32,7 +36,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_global/dist
key: ${{ runner.os }}-libcasm-global-v2-0-4
key: ${{ runner.os }}-libcasm-global-v2-0-5

- name: Install CASM dependencies
run: |
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test-linux-cxx-only.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing c++ only on ubuntu-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

env:
SKBUILD_BUILD_OPTIONS: --verbose
Expand Down Expand Up @@ -32,7 +36,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_global/dist
key: ${{ runner.os }}-libcasm-global-v2-0-4
key: ${{ runner.os }}-libcasm-global-v2-0-5

- name: Install CASM dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-linux-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_global/dist
key: ${{ runner.os }}-libcasm-global-v2-0-4
key: ${{ runner.os }}-libcasm-global-v2-0-5

- name: checkout libcasm-global
if: steps.cache-libcasm-global-restore.outputs.cache-hit != 'true'
uses: actions/checkout@v4
with:
repository: prisms-center/CASMcode_global
path: CASMcode_global
ref: v2.0.4
ref: v2.0.5

- name: make global
if: steps.cache-libcasm-global-restore.outputs.cache-hit != 'true'
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing on ubuntu-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

env:
SKBUILD_BUILD_OPTIONS: --verbose
Expand Down Expand Up @@ -32,7 +36,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_global/dist
key: ${{ runner.os }}-libcasm-global-v2-0-4
key: ${{ runner.os }}-libcasm-global-v2-0-5

- name: Install CASM dependencies
run: |
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test-macos-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing build on macos-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

jobs:
build:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test-macos.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing on macos-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

jobs:
build:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to `libcasm-composition` will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [2.0a3] - 2024-07-12

### Changed

- Wheels compiled with numpy>=2.0.0


## [2.0a2] - 2024-03-13

### Added
Expand Down
2 changes: 1 addition & 1 deletion build_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ scikit-build
cmake>=3.20
ninja
pybind11>=2.6
libcasm-global>=2.0.4
libcasm-global>=2.0.5
16 changes: 8 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ requires = [
"cmake>=3.20",
"ninja",
"pybind11>=2.6",
"libcasm-global>=2.0.4",
"libcasm-global>=2.0.5",
]
build-backend = "setuptools.build_meta"

[project]
name = "libcasm-composition"
version = "2.0a2"
version = "2.0a3"
authors = [
{ name="CASM developers", email="[email protected]" },
]
Expand All @@ -28,7 +28,7 @@ classifiers = [
"Topic :: Scientific/Engineering",
]
dependencies = [
"libcasm-global>=2.0.4",
"libcasm-global>=2.0.5",
"numpy",
]

Expand All @@ -41,13 +41,13 @@ source-dir = "doc"
build-dir = "doc/build"
all_files = 1

[tool.ruff]
select = ["E", "F", "I"]
[tool.ruff.lint]
select = ["NPY201", "E", "F", "I"]

[tool.ruff.per-file-ignores]
[tool.ruff.lint.per-file-ignores]
"__init__.py" = ["F401"]

[tool.ruff.isort]
[tool.ruff.lint.isort]
known-first-party = ["libcasm", "casm"]

[tool.cibuildwheel]
Expand All @@ -57,7 +57,7 @@ build = "cp39-* cp310-* cp311-* cp312-*"
skip = "pp*"

# Need libcasm-global at wheel repair stage
before-build = "pip install libcasm-global>=2.0.4"
before-build = "pip install libcasm-global>=2.0.5"

# Testing
test-requires = "pytest pytest-datadir"
Expand Down
2 changes: 1 addition & 1 deletion python/doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# -- package specific configuration --
project = "libcasm-composition"
version = "2.0" # The short X.Y version.
release = "2.0a2" # The full version, including alpha/beta/rc tags.
release = "2.0a3" # The full version, including alpha/beta/rc tags.
project_desc = "CASM Composition"
logo_text = "libcasm-composition"
github_url = "https://github.com/prisms-center/CASMcode_composition/"
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ requires = [
"setuptools",
"wheel",
"pybind11>=2.8.0",
"libcasm-global>=2.0.4",
"libcasm-global>=2.0.5",
]
build-backend = "setuptools.build_meta"
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os

__version__ = "2.0a2"
__version__ = "2.0a3"

# Available at setup time due to pyproject.toml
from pybind11.setup_helpers import Pybind11Extension, build_ext
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name="libcasm-composition",
version="2.0a2",
version="2.0a3",
packages=["libcasm", "libcasm.composition"],
package_dir={"": "python"},
cmake_install_dir="python/libcasm",
Expand Down

0 comments on commit 89e7af9

Please sign in to comment.