libcasm-global to >=2.0.4; libcasm-xtal to >=2.0a9; build python3.12 …

…wheels
prisms-center · Mar 14, 2024 · 5b1ca80 · 5b1ca80
1 parent 6cdda32
commit 5b1ca80
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 34 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,6 +1,6 @@
 build_and_store_wheels: &BUILD_AND_STORE_WHEELS
   install_cibuildwheel_script:
-    - python -m pip install cibuildwheel==2.14.1
+    - python -m pip install cibuildwheel==2.17.0
   run_cibuildwheel_script:
     - cibuildwheel
   wheels_artifacts:
@@ -24,11 +24,9 @@ linux_aarch64_task:
 macos_arm64_task:
   name: Build macOS arm64 wheels.
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
+    image: ghcr.io/cirruslabs/macos-sonoma-xcode
   env:
-    PATH: /opt/homebrew/opt/[email protected]/bin:$PATH
-    CIBW_ARCHS_MACOS: arm64
+    PATH: /opt/homebrew/opt/[email protected]/libexec/bin:$PATH
   install_pre_requirements_script:
     - brew install [email protected]
-    - ln -s python3 /opt/homebrew/opt/[email protected]/bin/python
   <<: *BUILD_AND_STORE_WHEELS
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Set up requirements and configuration variables
         run: |

diff --git a/.github/workflows/test-linux-build.yml b/.github/workflows/test-linux-build.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Set up requirements & configuration variables
         run: |
@@ -32,15 +32,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_global/dist
-          key: ${{ runner.os }}-libcasm-global-v2-0-3
+          key: ${{ runner.os }}-libcasm-global-v2-0-4
 
       ### 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-0a5
+          key: ${{ runner.os }}-libcasm-xtal-v2-0a9
 
       - name: Install CASM dependencies
         run: |

diff --git a/.github/workflows/test-linux-cxx-only.yml b/.github/workflows/test-linux-cxx-only.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Set up requirements & configuration variables
         run: |
@@ -32,15 +32,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_global/dist
-          key: ${{ runner.os }}-libcasm-global-v2-0-3
+          key: ${{ runner.os }}-libcasm-global-v2-0-4
 
       ### 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-0a5
+          key: ${{ runner.os }}-libcasm-xtal-v2-0a9
 
       - name: Install CASM dependencies
         run: |

diff --git a/.github/workflows/test-linux-dependencies.yml b/.github/workflows/test-linux-dependencies.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Set up requirements & configuration variables
         run: |
@@ -24,15 +24,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_global/dist
-          key: ${{ runner.os }}-libcasm-global-v2-0-3
+          key: ${{ runner.os }}-libcasm-global-v2-0-4
 
       - 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.3
+          ref: v2.0.4
 
       - 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-0a5
+          key: ${{ runner.os }}-libcasm-xtal-v2-0a9
 
       - 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.0a5
+          ref: v2.0a9
 
       - 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
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Set up requirements & configuration variables
         run: |
@@ -32,15 +32,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: CASMcode_global/dist
-          key: ${{ runner.os }}-libcasm-global-v2-0-3
+          key: ${{ runner.os }}-libcasm-global-v2-0-4
 
       ### 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-0a5
+          key: ${{ runner.os }}-libcasm-xtal-v2-0a9
 
       - name: Install CASM dependencies
         run: |

diff --git a/.github/workflows/test-macos-build.yml b/.github/workflows/test-macos-build.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Set up requirements & configuration variables
         run: |

diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Set up requirements & configuration variables
         run: |

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.2
-libcasm-xtal>=2.0a5
+libcasm-global>=2.0.4
+libcasm-xtal>=2.0a9
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,8 +6,8 @@ requires = [
     "cmake>=3.20",
     "ninja",
     "pybind11>=2.6",
-    "libcasm-global>=2.0.2",
-    "libcasm-xtal>=2.0a5",
+    "libcasm-global>=2.0.4",
+    "libcasm-xtal>=2.0a9",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -29,8 +29,8 @@ classifiers = [
     "Topic :: Scientific/Engineering",
 ]
 dependencies = [
-    "libcasm-global>=2.0.2",
-    "libcasm-xtal>=2.0a5",
+    "libcasm-global>=2.0.4",
+    "libcasm-xtal>=2.0a9",
     "numpy",
 ]
 
@@ -59,8 +59,8 @@ select = ["E", "F", "I"]
 known-first-party = ["libcasm", "casm"]
 
 [tool.cibuildwheel]
-# Build for python3.9, 3.10, 3.11
-build = "cp39-* cp310-* cp311-*"
+# Build for python3.9, 3.10, 3.11, 3.12
+build = "cp39-* cp310-* cp311-* cp312-*"
 # Build for cpython only
 skip =  "pp*"
 

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -4,7 +4,7 @@ requires = [
     "setuptools",
     "wheel",
     "pybind11>=2.8.0",
-    "libcasm-global>=2.0.2",
-    "libcasm-xtal>=2.0a5",
+    "libcasm-global>=2.0.4",
+    "libcasm-xtal>=2.0a9",
 ]
 build-backend = "setuptools.build_meta"
diff --git a/python/setup.py b/python/setup.py
@@ -82,8 +82,8 @@
     ],
     install_requires=[
         "pybind11",
-        "libcasm-global>=2.0.2",
-        "libcasm-xtal>=2.0a5",
+        "libcasm-global>=2.0.4",
+        "libcasm-xtal>=2.0a9",
     ],
     ext_modules=ext_modules,
     cmdclass={"build_ext": build_ext},