Merge branch 'master' into next

glotzerlab · Feb 12, 2024 · e0c2d29 · e0c2d29
2 parents 993844c + cdbbd51
commit e0c2d29
Show file tree

Hide file tree

Showing 6 changed files with 422 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
       with:
         path: freud-examples
     # Important! All steps that use the conda environment should define "shell: bash -l {0}".
-    - uses: conda-incubator/setup-miniconda@v2
+    - uses: conda-incubator/setup-miniconda@v3
       with:
         python-version: ${{ matrix.python-version }}
         mamba-version: "*"
@@ -81,7 +81,7 @@ jobs:
     # notify developers if the scheduled check fails
     - name: Slack notification
       if: ${{ github.event_name == 'schedule' && (failure() || cancelled()) }}
-      uses: 8398a7/[email protected].0
+      uses: 8398a7/[email protected].1
       with:
         status: ${{ job.status }}
         fields: workflow,job,message,commit

diff --git a/data/RAD.png b/data/RAD.png
diff --git a/data/SANN.png b/data/SANN.png
diff --git a/examples/Calculating Strain via Voxelization.ipynb b/examples/Calculating Strain via Voxelization.ipynb
@@ -67,7 +67,9 @@
     "\n",
     "    match = re.match('^Lattice=\".*\"', header)\n",
     "    boxstring = match.group(0)\n",
-    "    boxes.append(np.array(str.split(boxstring[9:-1]), dtype=np.float).reshape((3, 3)).T)\n",
+    "    boxes.append(\n",
+    "        np.array(str.split(boxstring[9:-1]), dtype=np.float32).reshape((3, 3)).T\n",
+    "    )\n",
     "    ff.close()\n",
     "\n",
     "# find the average box\n",
@@ -226,7 +228,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -240,7 +242,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.10.10"
   },
   "widgets": {
    "state": {

diff --git a/examples/Visualizing 3D Voronoi and Voxelization.ipynb b/examples/Visualizing 3D Voronoi and Voxelization.ipynb
@@ -210,7 +210,7 @@
    "outputs": [],
    "source": [
     "aq = freud.AABBQuery(box, positions)\n",
-    "voxel_neighbors = -np.ones(len(cubic_grid), dtype=np.int)\n",
+    "voxel_neighbors = -np.ones(len(cubic_grid), dtype=np.int32)\n",
     "for i, j, distance in aq.query(cubic_grid, {\"num_neighbors\": 1}):\n",
     "    voxel_neighbors[i] = j"
    ]
@@ -246,7 +246,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -260,7 +260,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.10.10"
   }
  },
  "nbformat": 4,