Buid linux wheels using manylinux_2_28; version bump 2.1.0

bpuchala · bpuchala · commit 54ec39d32f70 · 2025-07-07T23:41:27.000-04:00
diff --git a/.cirrus.yml b/.cirrus.yml
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -18,6 +18,7 @@ jobs:
         uses: pypa/cibuildwheel@v3.0.1
         env:
           CIBW_ARCHS_LINUX: x86_64
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
 
       - uses: actions/upload-artifact@v4
         with:
@@ -35,6 +36,7 @@ jobs:
         uses: pypa/cibuildwheel@v3.0.1
         env:
           CIBW_ARCHS_LINUX: aarch64
+          CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/test-linux-build.yml b/.github/workflows/test-linux-build.yml
@@ -36,15 +36,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_global/dist
-          key: ${{ runner.os }}-libcasm-global-v2-0-6
+          key: ${{ runner.os }}-libcasm-global-v2-1-0
 
       ### libcasm-xtal ###
       - name: restore libcasm-xtal cache
         id: cache-libcasm-xtal-restore
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_crystallography/dist
-          key: ${{ runner.os }}-libcasm-xtal-v2-0-0
+          key: ${{ runner.os }}-libcasm-xtal-v2-1-0
 
       - name: Install CASM dependencies
         run: |
diff --git a/.github/workflows/test-linux-cxx-only.yml b/.github/workflows/test-linux-cxx-only.yml
@@ -36,15 +36,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_global/dist
-          key: ${{ runner.os }}-libcasm-global-v2-0-6
+          key: ${{ runner.os }}-libcasm-global-v2-1-0
 
       ### libcasm-xtal ###
       - name: restore libcasm-xtal cache
         id: cache-libcasm-xtal-restore
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_crystallography/dist
-          key: ${{ runner.os }}-libcasm-xtal-v2-0-0
+          key: ${{ runner.os }}-libcasm-xtal-v2-1-0
 
       - name: Install CASM dependencies
         run: |
diff --git a/.github/workflows/test-linux-dependencies.yml b/.github/workflows/test-linux-dependencies.yml
@@ -24,15 +24,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_global/dist
-          key: ${{ runner.os }}-libcasm-global-v2-0-6
+          key: ${{ runner.os }}-libcasm-global-v2-1-0
 
       - 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.6
+          ref: v2.1.0
 
       - name: make global
         if: steps.cache-libcasm-global-restore.outputs.cache-hit != 'true'
@@ -58,15 +58,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_crystallography/dist
-          key: ${{ runner.os }}-libcasm-xtal-v2-0-0
+          key: ${{ runner.os }}-libcasm-xtal-v2-1-0
 
       - name: checkout libcasm-xtal
         if: steps.cache-libcasm-xtal-restore.outputs.cache-hit != 'true'
         uses: actions/checkout@v4
         with:
           repository: prisms-center/CASMcode_crystallography
           path: CASMcode_crystallography
-          ref: v2.0.0
+          ref: v2.1.0
 
       - name: make xtal
         if: steps.cache-libcasm-xtal-restore.outputs.cache-hit != 'true'
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -36,15 +36,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_global/dist
-          key: ${{ runner.os }}-libcasm-global-v2-0-6
+          key: ${{ runner.os }}-libcasm-global-v2-1-0
 
       ### libcasm-xtal ###
       - name: restore libcasm-xtal cache
         id: cache-libcasm-xtal-restore
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_crystallography/dist
-          key: ${{ runner.os }}-libcasm-xtal-v2-0-0
+          key: ${{ runner.os }}-libcasm-xtal-v2-1-0
 
       - name: Install CASM dependencies
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to `libcasm-mapping` 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.1.0] - 2025-08-07
+
+### Changed
+
+- Build Linux wheels using manylinux_2_28 (previously manylinux2014)
+- Removed Cirrus CI testing
+
 
 ## [2.0.1] - 2025-06-03
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(CASMcode_mapping VERSION 2.0.1 LANGUAGES CXX)
+project(CASMcode_mapping VERSION 2.1.0 LANGUAGES CXX)
 
 # set CMAKE_INSTALL_X variables
 include(GNUInstallDirs)
diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(CASMcode_mapping VERSION 2.0.1 LANGUAGES CXX)
+project(CASMcode_mapping VERSION 2.1.0 LANGUAGES CXX)
 
 # set CMAKE_INSTALL_X variables
 include(GNUInstallDirs)
diff --git a/build_requirements.txt b/build_requirements.txt
@@ -4,5 +4,5 @@ scikit-build
 cmake>=3.20
 ninja
 pybind11>=2.6
-libcasm-global>=2.0.6
-libcasm-xtal>=2.0.0
+libcasm-global>=2.1.0
+libcasm-xtal>=2.1.0
diff --git a/doc/doxygen_config b/doc/doxygen_config
@@ -38,7 +38,7 @@ PROJECT_NAME           = "CASM_mapping"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.0.1
+PROJECT_NUMBER         = 2.1.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,14 +6,14 @@ requires = [
     "cmake>=3.20",
     "ninja",
     "pybind11>=2.6",
-    "libcasm-global>=2.0.6",
-    "libcasm-xtal>=2.0.0",
+    "libcasm-global>=2.1.0",
+    "libcasm-xtal>=2.1.0",
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "libcasm-mapping"
-version = "2.0.1"
+version = "2.1.0"
 authors = [
   { name="CASM developers", email="casm-developers@lists.engr.ucsb.edu" },
 ]
@@ -28,8 +28,8 @@ classifiers = [
     "Topic :: Scientific/Engineering",
 ]
 dependencies = [
-  "libcasm-global>=2.0.6",
-  "libcasm-xtal>=2.0.0",
+  "libcasm-global>=2.1.0",
+  "libcasm-xtal>=2.1.0",
   "numpy",
 ]
 
@@ -51,8 +51,6 @@ known-first-party = ["libcasm", "casm"]
 [tool.cibuildwheel]
 # Build for python3.9, 3.10, 3.11, 3.12
 build = "cp39-* cp310-* cp311-* cp312-* cp313-*"
-# Build for cpython only
-skip =  "pp*"
 
 # Need libcasm dependencies at wheel repair stage
 before-build = "pip install -r build_requirements.txt"
@@ -69,6 +67,6 @@ repair-wheel-command = ""
 
 [tool.cibuildwheel.linux]
 # dependencies do not build for musl
-skip = ["pp* *musllinux*"]
+skip = ["*musllinux*"]
 
 repair-wheel-command = ""
diff --git a/python/doc/conf.py b/python/doc/conf.py
@@ -2,8 +2,8 @@
 
 # -- package specific configuration --
 project = "libcasm-mapping"
-version = "2.0"  # The short X.Y version.
-release = "2.0.1"  # The full version, including alpha/beta/rc tags.
+version = "2.1"  # The short X.Y version.
+release = "2.1.0"  # The full version, including alpha/beta/rc tags.
 project_desc = "CASM structure mapping"
 logo_text = "libcasm-mapping"
 github_url = "https://github.com/prisms-center/CASMcode_mapping/"
diff --git a/python/setup.py b/python/setup.py
@@ -1,6 +1,6 @@
 import os
 
-__version__ = "2.0.1"
+__version__ = "2.1.0"
 
 # Available at setup time due to pyproject.toml
 from pybind11.setup_helpers import Pybind11Extension, build_ext
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="libcasm-mapping",
-    version="2.0.1",
+    version="2.1.0",
     packages=[
         "libcasm",
         "libcasm.mapping",
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(CASMcode_mapping_tests VERSION 2.0.1 LANGUAGES CXX)
+project(CASMcode_mapping_tests VERSION 2.1.0 LANGUAGES CXX)
 
 
 # set CMAKE_INSTALL_X variables
diff --git a/tests/CMakeLists.txt.in b/tests/CMakeLists.txt.in
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(CASMcode_mapping_tests VERSION 2.0.1 LANGUAGES CXX)
+project(CASMcode_mapping_tests VERSION 2.1.0 LANGUAGES CXX)
 
 
 # set CMAKE_INSTALL_X variables
diff --git a/tests/unit/mapping/version_test.cpp b/tests/unit/mapping/version_test.cpp
@@ -24,7 +24,7 @@ TEST(VersionTest, TestGlobalVersion) {
   std::vector<int> version_vec{std::stoi(v_match[1].str()),
                                std::stoi(v_match[2].str()),
                                std::stoi(v_match[3].str())};
-  std::vector<int> min_version{2, 0, 1};
+  std::vector<int> min_version{2, 1, 0};
   EXPECT_TRUE(version_vec >= min_version)
       << "version: " << version_vec << " min_version: " << min_version
       << std::endl;
@@ -38,7 +38,7 @@ TEST(VersionTest, TestCrystallographyVersion) {
   std::vector<int> version_vec{std::stoi(v_match[1].str()),
                                std::stoi(v_match[2].str()),
                                std::stoi(v_match[3].str())};
-  std::vector<int> min_version{2, 0, 0};
+  std::vector<int> min_version{2, 1, 0};
   EXPECT_TRUE(version_vec >= min_version)
       << "version: " << version_vec << " min_version: " << min_version
       << std::endl;
@@ -53,10 +53,10 @@ TEST(VersionTest, TestMappingVersion) {
   // "beta.1", "beta.2", ...
   EXPECT_EQ(v_match.size(), 6);
   EXPECT_EQ(v_match[1].str(), "2");
-  EXPECT_EQ(v_match[2].str(), "0");
-  EXPECT_EQ(v_match[3].str(), "1");
+  EXPECT_EQ(v_match[2].str(), "1");
+  EXPECT_EQ(v_match[3].str(), "0");
   EXPECT_EQ(v_match[4].str(), "");
 
-  EXPECT_EQ(CASM::mapping::version(), "2.0.1");
+  EXPECT_EQ(CASM::mapping::version(), "2.1.0");
   EXPECT_EQ(CASM::mapping::version(), casm_mapping_version());
 }
