Skip to content

Commit

Permalink
Merge branch 'dev' into feature/SOF-7526
Browse files Browse the repository at this point in the history
  • Loading branch information
VsevolodX committed Dec 25, 2024
2 parents f061680 + 1d0b3ea commit 07f6d17
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.8.6"]
python-version: ["3.10.13"]

steps:
- name: Checkout this repository
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Publish python release
uses: ./actions/py/publish
with:
python-version: 3.8.x
python-version: 3.10.x
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
pypi-api-token: ${{ secrets.PYPI_API_TOKEN }}

Expand Down
37 changes: 37 additions & 0 deletions other/materials_designer/mat3ra.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": null,
"id": "initial_id",
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
""
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 2
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython2",
"version": "2.7.6"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,8 @@
"source": [
"from mat3ra.made.material import Material\n",
"from mat3ra.standata.materials import Materials\n",
"from mat3ra.made.tools.modify import rotate\n",
"\n",
"material = Material(Materials.get_by_name_first_match(\"SrTiO3\"))\n",
"# Rotate material to correctly identify multiple terminations.\n",
"# Without the rotation, the current implementation only finds a single termination (as of 2024-12).\n",
"material = rotate(material, axis=[1, 0, 0], angle=10)"
"material = Material(Materials.get_by_name_first_match(\"SrTiO3\"))"
],
"metadata": {
"collapsed": false
Expand Down
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ dependencies = [
"exabyte-api-client>=2023.6.13.post0",
"matplotlib>=3.4.1",
"pandas>=1.5.3",
# pinning pymatgen version to one used in API-examples for Pyodide
"pymatgen==2024.11.13",
"pymatgen==2024.4.13",
"mat3ra-made>=2024.6.11.post0",
"mat3ra-utils>=2024.6.11.post0",
]
Expand Down

0 comments on commit 07f6d17

Please sign in to comment.