Merge branch 'main' into add_animation

Author: tschaume

.github/workflows/issue-metrics.yml

@@ -1,8 +1,6 @@
 name: Monthly issue metrics
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '3 2 1 * *'
 
 permissions:
   contents: read

.github/workflows/pull-request.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.11"]
 
     steps:
       - uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
           PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
         run: python${{ matrix.python-version }} -m pytest --cov=crystal_toolkit --cov-report=xml --color=yes --webdriver Chrome --headless crystal_toolkit/apps/examples/tests/
       - uses: codecov/codecov-action@v1
-        if: matrix.python-version == 3.10
+        if: matrix.python-version == 3.11
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml

.github/workflows/pytest-docs.yml

@@ -17,14 +17,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.11"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'

.github/workflows/upgrade-dependencies.yml

@@ -3,9 +3,6 @@ name: upgrade dependencies
 
 on:
   workflow_dispatch: # Allow running on-demand
-  schedule:
-    # Runs every Monday at 8:00 UTC (4:00 Eastern)
-    - cron: "0 8 * * 1"
 
 jobs:
   upgrade:
@@ -71,6 +68,8 @@ jobs:
           git checkout -b auto-dependency-upgrades
           git branch -r | grep auto-dependency-upgrades- | xargs -I {} git merge {}
           git rebase ${GITHUB_REF##*/}
+          git reset $(git merge-base ${GITHUB_REF##*/} HEAD)
+          git commit -a -m "auto dependency upgrades"
           git push -f origin auto-dependency-upgrades
           git branch -r | grep auto-dependency-upgrades- | cut -d/ -f2 | xargs -I {} git push origin :{}
       - name: Open pull request if needed

crystal_toolkit/components/diffraction.py

@@ -56,28 +56,26 @@ def __init__(
     # Default XRD plot style settings
     default_xrd_plot_style = frozendict(
         xaxis={
-            "title": "2𝜃 / º",
+            "title": {"text": "2θ (°)", "font": {"size": 16}},
             "anchor": "y",
             "nticks": 8,
             "showgrid": True,
             "showline": True,
             "side": "bottom",
             "tickfont": {"size": 16.0},
             "ticks": "inside",
-            "titlefont": {"size": 16.0},
             "type": "linear",
             "zeroline": False,
         },
         yaxis={
-            "title": "Intensity / arb. units",
+            "title": {"text": "Intensity / arb. units", "font": {"size": 16}},
             "anchor": "x",
             "nticks": 7,
             "showgrid": True,
             "showline": True,
             "side": "left",
             "tickfont": {"size": 16.0},
             "ticks": "inside",
-            "titlefont": {"size": 16.0},
             "type": "linear",
             "zeroline": False,
         },

pyproject.toml

@@ -11,7 +11,6 @@ requires-python = ">=3.9"
 authors = [{ name = "Matt Horton", email = "mkhorton@lbl.gov" }]
 
 dependencies = [
-    "crystaltoolkit-extension",
     "dash-mp-components>=0.4.38",
     "dash>=2.11.0",
     "flask-caching",
@@ -43,7 +42,8 @@ dev = [
     "recommonmark",
     "sphinx_rtd_theme",
 ]
-test = ["playwright", "pytest", "pytest-playwright", "pytest-cov"]
+test = ["playwright", "pytest", "pytest-playwright", "pytest-cov", "selenium<4", "urllib3<2"]
+jupyterlab_deprecated = ["crystaltoolkit-extension"]
 
 [project.urls]
 repo = "https://github.com/materialsproject/crystaltoolkit"