From a5fa567a363b62b35109c1938c1c1802ea9b0117 Mon Sep 17 00:00:00 2001 From: bpuchala Date: Tue, 10 Dec 2024 11:23:46 -0500 Subject: [PATCH 1/2] bump version 2.0a12 --- CHANGELOG.md | 3 ++- pyproject.toml | 2 +- python/doc/conf.py | 2 +- python/setup.py | 2 +- setup.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9532391..bd4a00d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ All notable changes to `libcasm-xtal` 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). -## Unreleased + +## [2.0a12] - 2024-12-10 ### Fixed diff --git a/pyproject.toml b/pyproject.toml index ab9451d..d4544b7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta" [project] name = "libcasm-xtal" -version = "2.0a11" +version = "2.0a12" authors = [ { name="CASM developers", email="casm-developers@lists.engr.ucsb.edu" }, ] diff --git a/python/doc/conf.py b/python/doc/conf.py index a27d764..7eab317 100644 --- a/python/doc/conf.py +++ b/python/doc/conf.py @@ -3,7 +3,7 @@ # -- package specific configuration -- project = "libcasm-xtal" version = "2.0" # The short X.Y version. -release = "2.0a11" # The full version, including alpha/beta/rc tags. +release = "2.0a12" # The full version, including alpha/beta/rc tags. project_desc = "CASM Crystallography" logo_text = "libcasm-xtal" github_url = "https://github.com/prisms-center/CASMcode_crystallography/" diff --git a/python/setup.py b/python/setup.py index 719ccb8..ce8ada5 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,6 +1,6 @@ import os -__version__ = "2.0a11" +__version__ = "2.0a12" # Available at setup time due to pyproject.toml from pybind11.setup_helpers import Pybind11Extension, build_ext diff --git a/setup.py b/setup.py index b43224b..cf31780 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="libcasm-xtal", - version="2.0a11", + version="2.0a12", packages=["libcasm", "libcasm.xtal"], package_dir={"": "python"}, cmake_install_dir="python/libcasm", From f6efd8bd0802d99d73e8fc8e37713e28f42f6f83 Mon Sep 17 00:00:00 2001 From: bpuchala Date: Tue, 10 Dec 2024 11:55:09 -0500 Subject: [PATCH 2/2] Build macos x86_64 wheels with macos-13 Github Actions runner --- .github/workflows/build_wheels.yml | 8 ++++---- CHANGELOG.md | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index f09b30e..cf35a7e 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -24,9 +24,9 @@ jobs: name: dist_linux path: ./wheelhouse/*.whl - build_wheels_macos12_x86_64: - name: Build x86_64 wheels on macos-12 - runs-on: macos-12 + build_wheels_macos13_x86_64: + name: Build x86_64 wheels on macos-13 + runs-on: macos-13 steps: - uses: actions/checkout@v4 @@ -38,7 +38,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: dist_macos12_x86_64 + name: dist_macos13_x86_64 path: ./wheelhouse/*.whl build_wheels_macos14_arm64: diff --git a/CHANGELOG.md b/CHANGELOG.md index bd4a00d..11f543e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `Lattice.voronoi_table`, `Lattice.voronoi_number`, and `Lattice.voronoi_inner_radius`. +### Changed + +- Build macos x86_64 wheels with macos-13 Github Actions runner + ## [2.0a11] - 2024-08-09