Merge pull request #561 from alex-rakowski/python-312

Celebrating the 38th day anniversary of 3.12 offical release
py4dstem · Nov 13, 2023 · c31f38c · c31f38c
2 parents cf6a6a4 + c6633ac
commit c31f38c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/check_install_dev.yml b/.github/workflows/check_install_dev.yml
@@ -16,7 +16,7 @@ jobs:
                 allow_failure: [false]
                 runs-on: [ubuntu-latest]
                 architecture: [x86_64]
-                python-version: ["3.9", "3.10", "3.11",]
+                python-version: ["3.9", "3.10", "3.11", "3.12"]
                 # include:
                 #     - python-version: "3.12.0-beta.4"
                 #       runs-on: ubuntu-latest

diff --git a/.github/workflows/check_install_main.yml b/.github/workflows/check_install_main.yml
@@ -16,7 +16,7 @@ jobs:
                 allow_failure: [false]
                 runs-on: [ubuntu-latest, windows-latest, macos-latest]
                 architecture: [x86_64]
-                python-version: ["3.9", "3.10", "3.11",]
+                python-version: ["3.9", "3.10", "3.11", "3.12"]
                 #include:
                 #    - python-version: "3.12.0-beta.4"
                 #      runs-on: ubuntu-latest

diff --git a/.github/workflows/check_install_quick.yml b/.github/workflows/check_install_quick.yml
@@ -20,7 +20,7 @@ jobs:
                 allow_failure: [false]
                 runs-on: [ubuntu-latest] 
                 architecture: [x86_64]
-                python-version: ["3.10"]
+                python-version: ["3.9", "3.12"]
                 # Currently no public runners available for this but this or arm64 should work next time
                 # include:
                 #     - python-version: "3.10"

diff --git a/py4DSTEM/process/diffraction/crystal_viz.py b/py4DSTEM/process/diffraction/crystal_viz.py
@@ -519,7 +519,7 @@ def plot_orientation_zones(
     # x = r * np.sin(theta)
     # y = r * np.cos(theta)
 
-    warnings.filterwarnings("ignore", module="matplotlib\..*")
+    warnings.filterwarnings("ignore", module=r"matplotlib\..*")
     line_params = {"linewidth": 2, "alpha": 0.1, "c": "k"}
     for phi in np.arange(0, 180, 5):
         ax.plot3D(
@@ -1704,11 +1704,11 @@ def plot_fiber_orientation_maps(
             np.round(leg_size * 1.0),
         ]
         labels = [
-            str(np.round(self.orientation_fiber_angles[0] * 0.00)) + "$\degree$",
-            str(np.round(self.orientation_fiber_angles[0] * 0.25)) + "$\degree$",
-            str(np.round(self.orientation_fiber_angles[0] * 0.50)) + "$\degree$",
-            str(np.round(self.orientation_fiber_angles[0] * 0.75)) + "$\degree$",
-            str(np.round(self.orientation_fiber_angles[0] * 1.00)) + "$\degree$",
+            str(np.round(self.orientation_fiber_angles[0] * 0.00)) + "$\\degree$",
+            str(np.round(self.orientation_fiber_angles[0] * 0.25)) + "$\\degree$",
+            str(np.round(self.orientation_fiber_angles[0] * 0.50)) + "$\\degree$",
+            str(np.round(self.orientation_fiber_angles[0] * 0.75)) + "$\\degree$",
+            str(np.round(self.orientation_fiber_angles[0] * 1.00)) + "$\\degree$",
         ]
         ax_op_l.set_xticks(ticks)
         ax_op_l.set_xticklabels(labels)

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
     author_email="[email protected]",
     license="GNU GPLv3",
     keywords="STEM 4DSTEM",
-    python_requires=">=3.9,<3.12",
+    python_requires=">=3.9,<=3.12",
     install_requires=[
         "numpy >= 1.19",
         "scipy >= 1.5.2",