Skip to content

Commit 3a93fb6

Browse files
authored
Merge pull request #136 from sandialabs/dev
peanuts
2 parents be3468e + c874ddd commit 3a93fb6

File tree

5 files changed

+25
-9
lines changed

5 files changed

+25
-9
lines changed

.github/workflows/version.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,28 @@ jobs:
1414
with:
1515
myToken: ${{ github.token }}
1616
view_top: 1
17-
- name: check
17+
- name: rust
1818
run: |
1919
pip install packaging
2020
export LATEST_VERSION=$(echo ${{ steps.last_release.outputs.tag_name }} | cut -d v -f 2)
2121
echo "latest tag is ${LATEST_VERSION}"
22-
export CURRENT_VERSION=$(grep -m 1 version Cargo.toml | cut -d '"' -f 2)
23-
echo "version in PR is ${CURRENT_VERSION}"
24-
export CHECK=$(python -c 'from packaging.version import parse; print(parse("'${CURRENT_VERSION}'") > parse("'${LATEST_VERSION}'"))' | tr '[:upper:]' '[:lower:]')
25-
$CHECK
22+
export CURRENT_VERSION_RUST=$(grep -m 1 version Cargo.toml | cut -d '"' -f 2)
23+
echo "rust version in PR is ${CURRENT_VERSION_RUST}"
24+
export CHECK=$(python -c 'from packaging.version import parse; print(parse("'${CURRENT_VERSION_RUST}'") > parse("'${LATEST_VERSION}'"))' | tr '[:upper:]' '[:lower:]')
25+
$CHECK
26+
- name: julia
27+
run: |
28+
export LATEST_VERSION=$(echo ${{ steps.last_release.outputs.tag_name }} | cut -d v -f 2)
29+
echo "latest tag is ${LATEST_VERSION}"
30+
export CURRENT_VERSION_JULIA=$(grep -m 1 version Project.toml | cut -d '"' -f 2)
31+
echo "julia version in PR is ${CURRENT_VERSION_JULIA}"
32+
export CHECK=$(python -c 'from packaging.version import parse; print(parse("'${CURRENT_VERSION_JULIA}'") > parse("'${LATEST_VERSION}'"))' | tr '[:upper:]' '[:lower:]')
33+
$CHECK
34+
- name: both
35+
run: |
36+
export CURRENT_VERSION_RUST=$(grep -m 1 version Cargo.toml | cut -d '"' -f 2)
37+
echo "rust version in PR is ${CURRENT_VERSION_RUST}"
38+
export CURRENT_VERSION_JULIA=$(grep -m 1 version Project.toml | cut -d '"' -f 2)
39+
echo "julia version in PR is ${CURRENT_VERSION_JULIA}"
40+
export CHECK=$(python -c 'from packaging.version import parse; print(parse("'${CURRENT_VERSION_RUST}'") == parse("'${CURRENT_VERSION_JULIA}'"))' | tr '[:upper:]' '[:lower:]')
41+
$CHECK

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polymers"
3-
version = "0.0.10"
3+
version = "0.0.11"
44
edition = "2021"
55
description = "Polymers Modeling Library"
66
license = "BSD-3-Clause"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Polymers"
22
uuid = "8aef037c-a721-4e8a-9d81-eb7093daef2c"
33
authors = ["mrbuche <[email protected]>"]
4-
version = "0.0.7"
4+
version = "0.0.11"
55

66
[deps]
77
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"

docs/source/physics/single_chain/fjc/thermodynamics/example_thermodynamic_limit.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"source": [
88
"# Ensembles and the thermodynamic limit\n",
99
"\n",
10-
"[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/sandialabs/Polymers/main?labpath=docs%2Fsource%2F%2Fphysics%2Fsingle_chain%2Ffjc%2Fthermodynamics%2Fthermodynamic_limit.ipynb)"
10+
"[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/sandialabs/Polymers/main?labpath=docs%2Fsource%2F%2Fphysics%2Fsingle_chain%2Ffjc%2Fthermodynamics%2Fexample_thermodynamic_limit.ipynb)"
1111
]
1212
},
1313
{

docs/source/physics/single_chain/fjc/thermodynamics/modified_canonical/example_asymptotic.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"source": [
88
"# Asymptotic approximations\n",
99
"\n",
10-
"[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/sandialabs/Polymers/main?labpath=docs%2Fsource%2F%2Fphysics%2Fsingle_chain%2Ffjc%2Fthermodynamics%2Fmodified_canonical%2Fasymptotic.ipynb)"
10+
"[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/sandialabs/Polymers/main?labpath=docs%2Fsource%2F%2Fphysics%2Fsingle_chain%2Ffjc%2Fthermodynamics%2Fmodified_canonical%2Fexample_asymptotic.ipynb)"
1111
]
1212
},
1313
{

0 commit comments

Comments
 (0)