Merge pull request #12 from prisms-center/main

Merge 2.0a3 into 2.X
prisms-center · Oct 26, 2023 · d9da0a5 · d9da0a5
2 parents f03a12a + 47e0af6
commit d9da0a5
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 15 deletions.
diff --git a/.github/workflows/test-linux-build.yml b/.github/workflows/test-linux-build.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: CASMcode_crystallography/dist
-          key: ${{ runner.os }}-libcasm-xtal-v2-0a4
+          key: ${{ runner.os }}-libcasm-xtal-v2-0a5
 
       - name: Install CASM dependencies
         run: |

diff --git a/.github/workflows/test-linux-cxx-only.yml b/.github/workflows/test-linux-cxx-only.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: CASMcode_crystallography/dist
-          key: ${{ runner.os }}-libcasm-xtal-v2-0a4
+          key: ${{ runner.os }}-libcasm-xtal-v2-0a5
 
       - name: Install CASM dependencies
         run: |

diff --git a/.github/workflows/test-linux-dependencies.yml b/.github/workflows/test-linux-dependencies.yml
@@ -58,15 +58,15 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: CASMcode_crystallography/dist
-          key: ${{ runner.os }}-libcasm-xtal-v2-0a4
+          key: ${{ runner.os }}-libcasm-xtal-v2-0a5
 
       - name: checkout libcasm-xtal
         if: steps.cache-libcasm-xtal-restore.outputs.cache-hit != 'true'
         uses: actions/checkout@v3
         with:
           repository: prisms-center/CASMcode_crystallography
           path: CASMcode_crystallography
-          ref: v2.0a4
+          ref: v2.0a5
 
       - 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
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: CASMcode_crystallography/dist
-          key: ${{ runner.os }}-libcasm-xtal-v2-0a4
+          key: ${{ runner.os }}-libcasm-xtal-v2-0a5
 
       - name: Install CASM dependencies
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to `libcasm-clexulator` 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] - 2023-10-25
+
+### Fixed
+
+- Fixed error messages for conversion of local DoF to the standard basis
+- Fixed DiffClexParamPack traits namespace
+
+### Added
+
+- Tests for correct treatment of local DoF basis with dim=0 on some sublattices
+
 
 ## [2.0a2] - 2023-09-28
 

diff --git a/build_requirements.txt b/build_requirements.txt
@@ -5,4 +5,4 @@ cmake>=3.20
 ninja
 pybind11>=2.6
 libcasm-global>=2.0.2
-libcasm-xtal>=2.0a4
+libcasm-xtal>=2.0a5
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,13 +7,13 @@ requires = [
     "ninja",
     "pybind11>=2.6",
     "libcasm-global>=2.0.2",
-    "libcasm-xtal>=2.0a4",
+    "libcasm-xtal>=2.0a5",
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "libcasm-clexulator"
-version = "2.0a2"
+version = "2.0a3"
 authors = [
   { name="CASM developers", email="[email protected]" },
 ]
@@ -30,7 +30,7 @@ classifiers = [
 ]
 dependencies = [
     "libcasm-global>=2.0.2",
-    "libcasm-xtal>=2.0a4",
+    "libcasm-xtal>=2.0a5",
     "numpy",
 ]
 

diff --git a/python/doc/conf.py b/python/doc/conf.py
@@ -97,7 +97,7 @@
 # The short X.Y version.
 version = "2.0"
 # The full version, including alpha/beta/rc tags.
-release = "2.0a2"
+release = "2.0a3"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -5,6 +5,6 @@ requires = [
     "wheel",
     "pybind11>=2.8.0",
     "libcasm-global>=2.0.2",
-    "libcasm-xtal>=2.0a4",
+    "libcasm-xtal>=2.0a5",
 ]
 build-backend = "setuptools.build_meta"
diff --git a/python/setup.py b/python/setup.py
@@ -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
@@ -83,7 +83,7 @@
     install_requires=[
         "pybind11",
         "libcasm-global>=2.0.2",
-        "libcasm-xtal>=2.0a4",
+        "libcasm-xtal>=2.0a5",
     ],
     ext_modules=ext_modules,
     cmdclass={"build_ext": build_ext},

diff --git a/python/src/clexulator.cpp b/python/src/clexulator.cpp
@@ -1895,7 +1895,7 @@ PYBIND11_MODULE(_clexulator, m) {
       .def_readonly("dof_key", &clexulator::DoFSpace::dof_key, R"pbdoc(
           str : The DoF type for this DoFSpace.
           )pbdoc")
-      .def_readonly("is_global", &clexulator::DoFSpace::dof_key, R"pbdoc(
+      .def_readonly("is_global", &clexulator::DoFSpace::is_global, R"pbdoc(
           bool : True if the DoF type is a global DoF, False otherwise.
           )pbdoc")
       .def_readonly("prim", &clexulator::DoFSpace::prim, R"pbdoc(

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="libcasm-clexulator",
-    version="2.0a2",
+    version="2.0a3",
     packages=["libcasm", "libcasm.clexulator"],
     package_dir={"": "python"},
     cmake_install_dir="python/libcasm",