Merge branch '2.X_enumerate_superlattices_shape' into 2.09

prisms-center · Jan 26, 2024 · 279e1b1 · 279e1b1
2 parents 5982a81 + 4675ab9
commit 279e1b1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/test-linux-build.yml b/.github/workflows/test-linux-build.yml
@@ -32,7 +32,7 @@ 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: Install CASM dependencies
         run: |

diff --git a/.github/workflows/test-linux-cxx-only.yml b/.github/workflows/test-linux-cxx-only.yml
@@ -32,7 +32,7 @@ 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: Install CASM dependencies
         run: |

diff --git a/.github/workflows/test-linux-dependencies.yml b/.github/workflows/test-linux-dependencies.yml
@@ -24,7 +24,7 @@ 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'

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -32,7 +32,7 @@ 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: Install CASM dependencies
         run: |

diff --git a/build_requirements.txt b/build_requirements.txt
@@ -4,4 +4,4 @@ scikit-build
 cmake>=3.20
 ninja
 pybind11>=2.6
-libcasm-global>=2.0.2
+libcasm-global>=2.0.4
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ requires = [
     "cmake>=3.20",
     "ninja",
     "pybind11>=2.6",
-    "libcasm-global>=2.0.2",
+    "libcasm-global>=2.0.4",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -28,7 +28,7 @@ classifiers = [
     "Topic :: Scientific/Engineering",
 ]
 dependencies = [
-  "libcasm-global>=2.0.2",
+  "libcasm-global>=2.0.4",
   "numpy",
 ]
 
@@ -57,7 +57,7 @@ build = "cp39-* cp310-* cp311-*"
 skip =  "pp*"
 
 # Need libcasm-global at wheel repair stage
-before-build = "pip install libcasm-global>=2.0.2"
+before-build = "pip install libcasm-global>=2.0.4"
 
 # Testing
 test-requires = "pytest pytest-datadir"

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -4,6 +4,6 @@ requires = [
     "setuptools",
     "wheel",
     "pybind11>=2.8.0",
-    "libcasm-global>=2.0.2",
+    "libcasm-global>=2.0.4",
 ]
 build-backend = "setuptools.build_meta"
diff --git a/python/setup.py b/python/setup.py
@@ -71,7 +71,7 @@
     name="libcasm-xtal",
     version=__version__,
     packages=["libcasm", "libcasm.xtal"],
-    install_requires=["pybind11", "libcasm-global>=2.0.2"],
+    install_requires=["pybind11", "libcasm-global>=2.0.4"],
     ext_modules=ext_modules,
     cmdclass={"build_ext": build_ext},
 )