Skip to content

Commit

Permalink
update dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
bpuchala committed Aug 16, 2024
1 parent 7db3195 commit 509160d
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_crystallography/dist
key: ${{ runner.os }}-libcasm-xtal-v2-0a10
key: ${{ runner.os }}-libcasm-xtal-v2-0a11

### libcasm-clexulator ###
- name: restore libcasm-clexulator cache
Expand All @@ -69,7 +69,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_configuration/dist
key: ${{ runner.os }}-libcasm-configuration-v2-0a4
key: ${{ runner.os }}-libcasm-configuration-v2-0a5

### libcasm-monte ###
- name: restore libcasm-monte cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-linux-cxx-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_crystallography/dist
key: ${{ runner.os }}-libcasm-xtal-v2-0a10
key: ${{ runner.os }}-libcasm-xtal-v2-0a11

### libcasm-clexulator ###
- name: restore libcasm-clexulator cache
Expand All @@ -69,7 +69,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_configuration/dist
key: ${{ runner.os }}-libcasm-configuration-v2-0a4
key: ${{ runner.os }}-libcasm-configuration-v2-0a5

### libcasm-monte ###
- name: restore libcasm-monte cache
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-linux-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_crystallography/dist
key: ${{ runner.os }}-libcasm-xtal-v2-0a10
key: ${{ runner.os }}-libcasm-xtal-v2-0a11

- 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.0a10
ref: v2.0a11

- name: make xtal
if: steps.cache-libcasm-xtal-restore.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -198,15 +198,15 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_configuration/dist
key: ${{ runner.os }}-libcasm-configuration-v2-0a4
key: ${{ runner.os }}-libcasm-configuration-v2-0a5

- name: checkout libcasm-configuration
if: steps.cache-libcasm-configuration-restore.outputs.cache-hit != 'true'
uses: actions/checkout@v4
with:
repository: prisms-center/CASMcode_configuration
path: CASMcode_configuration
ref: v2.0a4
ref: v2.0a5

- name: make configuration
if: steps.cache-libcasm-configuration-restore.outputs.cache-hit != 'true'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-linux-pip-install-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ jobs:
with:
repository: prisms-center/CASMcode_crystallography
path: CASMcode_crystallography
ref: v2.0a10
ref: v2.0a11

- name: test libcasm-xtal
shell: bash
run: |
cd CASMcode_crystallography
pip install libcasm-xtal==2.0a10
pip install libcasm-xtal==2.0a11
pip install -r test_requirements.txt
python -m pytest -rsap python/tests
Expand All @@ -102,13 +102,13 @@ jobs:
with:
repository: prisms-center/CASMcode_configuration
path: CASMcode_configuration
ref: v2.0a4
ref: v2.0a5

- name: test libcasm-configuration
shell: bash
run: |
cd CASMcode_configuration
pip install libcasm-configuration==2.0a4
pip install libcasm-configuration==2.0a5
pip install -r test_requirements.txt
python -m pytest -rsap python/tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_crystallography/dist
key: ${{ runner.os }}-libcasm-xtal-v2-0a10
key: ${{ runner.os }}-libcasm-xtal-v2-0a11

### libcasm-clexulator ###
- name: restore libcasm-clexulator cache
Expand All @@ -69,7 +69,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_configuration/dist
key: ${{ runner.os }}-libcasm-configuration-v2-0a4
key: ${{ runner.os }}-libcasm-configuration-v2-0a5

### libcasm-monte ###
- name: restore libcasm-monte cache
Expand Down
12 changes: 6 additions & 6 deletions build_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ scikit-build
cmake>=3.20
ninja
pybind11>=2.6
libcasm-global>=2.0.2
libcasm-xtal>=2.0a8
libcasm-composition>=2.0a1
libcasm-clexulator>=2.0a3
libcasm-configuration>=2.0a2
libcasm-monte>=2.0a1
libcasm-global>=2.0.5
libcasm-xtal>=2.0a11
libcasm-composition>=2.0a3
libcasm-clexulator>=2.0a5
libcasm-configuration>=2.0a5
libcasm-monte>=2.0a2
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ requires = [
"ninja",
"pybind11>=2.8.0",
"libcasm-global>=2.0.5",
"libcasm-xtal>=2.0a10",
"libcasm-xtal>=2.0a11",
"libcasm-composition>=2.0a3",
"libcasm-clexulator>=2.0a5",
"libcasm-configuration>=2.0a4",
"libcasm-configuration>=2.0a5",
"libcasm-monte>=2.0a2",
]
build-backend = "setuptools.build_meta"
Expand All @@ -34,10 +34,10 @@ classifiers = [
]
dependencies = [
"libcasm-global>=2.0.5",
"libcasm-xtal>=2.0a10",
"libcasm-xtal>=2.0a11",
"libcasm-composition>=2.0a3",
"libcasm-clexulator>=2.0a5",
"libcasm-configuration>=2.0a4",
"libcasm-configuration>=2.0a5",
"libcasm-monte>=2.0a2",
"numpy",
]
Expand Down
12 changes: 6 additions & 6 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ requires = [
"setuptools",
"wheel",
"pybind11>=2.8.0",
"libcasm-global>=2.0.2",
"libcasm-xtal>=2.0a2",
"libcasm-composition>=2.0a1",
"libcasm-clexulator>=2.0a3",
"libcasm-configuration>=2.0a2",
"libcasm-monte>=2.0a1",
"libcasm-global>=2.0.5",
"libcasm-xtal>=2.0a11",
"libcasm-composition>=2.0a3",
"libcasm-clexulator>=2.0a5",
"libcasm-configuration>=2.0a5",
"libcasm-monte>=2.0a2",
]

build-backend = "setuptools.build_meta"
Expand Down
12 changes: 6 additions & 6 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@
],
install_requires=[
"pybind11",
"libcasm-global>=2.0.2",
"libcasm-xtal>=2.0a8",
"libcasm-composition>=2.0a1",
"libcasm-clexulator>=2.0a3",
"libcasm-configuration>=2.0a2",
"libcasm-monte>=2.0a1",
"libcasm-global>=2.0.5",
"libcasm-xtal>=2.0a11",
"libcasm-composition>=2.0a3",
"libcasm-clexulator>=2.0a5",
"libcasm-configuration>=2.0a5",
"libcasm-monte>=2.0a2",
],
ext_modules=ext_modules,
cmdclass={"build_ext": build_ext},
Expand Down

0 comments on commit 509160d

Please sign in to comment.