empix 0.0.9__tar.gz → 0.0.10__tar.gz

{empix-0.0.9 → empix-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: empix
-Version: 0.0.9
+Version: 0.0.10
 Summary: Contains tools for analyzing electron microscopy data that are not available in ``hyperspy``.
 Author-email: Matthew Fitzpatrick <matthew.rc.fitzpatrick@gmail.com>
 Project-URL: Homepage, https://mrfitzpa.github.io/empix
@@ -26,6 +26,7 @@ Requires-Dist: fancytypes>=1.0.0
 Requires-Dist: hyperspy
 Requires-Dist: pyFAI
 Requires-Dist: numba
+Requires-Dist: scikit-image
 Provides-Extra: tests
 Requires-Dist: pytest-cov; extra == "tests"
 Provides-Extra: examples

{empix-0.0.9 → empix-0.0.10}/docs/build_docs.py

@@ -98,16 +98,28 @@ _mvdir("./_build/html/", "./pages/")
 
 cmd_output_as_bytes = subprocess.check_output("git tag", shell=True)
 cmd_output = cmd_output_as_bytes.decode("utf-8")
-tags = cmd_output.rstrip("\n").split("\n")
+tag_set = cmd_output.rstrip("\n").split("\n")
 
 pattern = r"v[0-9]+\.[0-9]+\.[0-9]+"
-release_tags = tuple(tag for tag in tags if re.fullmatch(pattern, tag))
+release_tag_set = tuple(tag for tag in tag_set if re.fullmatch(pattern, tag))
 
-for tag in release_tags:
+version_subset = dict()
+for tag in release_tag_set:
     version = tag[1:]
-    language = "en"
-    _build_doc(version, language, tag)
-    _mvdir("./_build/html/", "./pages/"+version+"/"+language+"/")
+    major, minor, patch = [int(int_as_str) for int_as_str in version.split(".")]
+    version_subset.setdefault(major, dict())
+    version_subset[major].setdefault(minor, 0)
+    version_subset[major][minor] = max(version_subset[major][minor], patch)
+
+for major in sorted(version_subset.keys()):
+    for minor in sorted(version_subset[major].keys()):
+        patch = version_subset[major][minor]
+        version = "{}.{}.{}".format(major, minor, patch)
+        tag = "v"+version
+        major_minor = "{}.{}".format(major, minor)
+        language = "en"
+        _build_doc(version, language, tag)
+        _mvdir("./_build/html/", "./pages/"+major_minor+"/"+language+"/")
 
 subprocess.run("cd ..; pip install .; cd docs", shell=True)
 _mvdir("./pages/", "../pages/")

{empix-0.0.9 → empix-0.0.10}/docs/conf.py

@@ -163,33 +163,54 @@ build_all_docs = os.environ.get("build_all_docs", None)
 pages_root = os.environ.get("pages_root", "")
 
 if build_all_docs is not None:
-    current_language = os.environ.get("current_language")
+    current_language = os.environ.get("current_language")    
     current_version = os.environ.get("current_version")
 
+    major, minor, patch = ((None, None, None)
+                           if (current_version == "latest")
+                           else current_version.split("."))
+    current_major_minor = ("latest"
+                           if (major is None)
+                           else "{}.{}".format(major, minor))
+
     html_context = {"current_language" : current_language,
                     "languages" : [],
-                    "current_version" : current_version,
+                    "current_version" : current_major_minor,
                     "versions" : []}
 
-    if (current_version == "latest"):
+    if current_version == "latest":
         html_context["languages"].append(["en", pages_root])
 
-    if (current_language == "en"):
+    if current_language == "en":
         html_context["versions"].append(["latest", pages_root])
 
     cmd_output_as_bytes = subprocess.check_output("git tag", shell=True)
     cmd_output = cmd_output_as_bytes.decode("utf-8")
-    tags = cmd_output.rstrip("\n").split("\n")
+    tag_set = cmd_output.rstrip("\n").split("\n")
 
     pattern = r"v[0-9]+\.[0-9]+\.[0-9]+"
-    release_tags = tuple(tag for tag in tags if re.fullmatch(pattern, tag))
+    release_tag_set = tuple(tag
+                            for tag
+                            in tag_set
+                            if re.fullmatch(pattern, tag))
 
-    if (current_version != "latest"):
+    version_subset = dict()
+    for tag in release_tag_set:
+        version = tag[1:]
+        major, minor, patch = [int(int_as_str)
+                               for int_as_str
+                               in version.split(".")]
+        version_subset.setdefault(major, dict())
+        version_subset[major].setdefault(minor, 0)
+        version_subset[major][minor] = max(version_subset[major][minor], patch)
+
+    if current_version != "latest":
         language = "en"
-        path = pages_root+"/"+current_version+"/"+language
+        path = pages_root+"/"+current_major_minor+"/"+language
         html_context["languages"].append([language, path])
 
-    for tag in release_tags:
-        version = tag[1:]
-        path = pages_root+"/"+version+"/"+current_language
-        html_context["versions"].append([version, path])
+    for major in sorted(version_subset.keys()):
+        for minor in sorted(version_subset[major].keys()):
+            major_minor = "{}.{}".format(major, minor)
+            path = pages_root+"/"+major_minor+"/"+current_language
+            html_context["versions"].append([major_minor, path])

{empix-0.0.9 → empix-0.0.10}/docs/index.rst

@@ -1,3 +1,8 @@
+.. meta::
+   :google-site-verification: kxE4d_wW0ikuxlKuVCgIxNZT81VDOxKWJ7R9mbTnvKA
+
+
+
 Electron Microscopy Pix (EMPix)
 ===============================
 

{empix-0.0.9 → empix-0.0.10}/empix/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.9'
-__version_tuple__ = version_tuple = (0, 0, 9)
+__version__ = version = '0.0.10'
+__version_tuple__ = version_tuple = (0, 0, 10)
 
-__commit_id__ = commit_id = 'g28d6964b8'
+__commit_id__ = commit_id = 'gdc5580860'

{empix-0.0.9 → empix-0.0.10}/empix.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: empix
-Version: 0.0.9
+Version: 0.0.10
 Summary: Contains tools for analyzing electron microscopy data that are not available in ``hyperspy``.
 Author-email: Matthew Fitzpatrick <matthew.rc.fitzpatrick@gmail.com>
 Project-URL: Homepage, https://mrfitzpa.github.io/empix
@@ -26,6 +26,7 @@ Requires-Dist: fancytypes>=1.0.0
 Requires-Dist: hyperspy
 Requires-Dist: pyFAI
 Requires-Dist: numba
+Requires-Dist: scikit-image
 Provides-Extra: tests
 Requires-Dist: pytest-cov; extra == "tests"
 Provides-Extra: examples

{empix-0.0.9 → empix-0.0.10}/empix.egg-info/requires.txt

@@ -3,6 +3,7 @@ fancytypes>=1.0.0
 hyperspy
 pyFAI
 numba
+scikit-image
 
 [all]
 empix[docs,examples,tests]

{empix-0.0.9 → empix-0.0.10}/examples/basic_usage.ipynb

@@ -131,13 +131,13 @@
     "\n",
     "    conda install -y empix jupyter ipympl -c conda-forge\n",
     "\n",
-    "You can find the documentation for the emicroml library\n",
+    "You can find the documentation for the ``empix`` library\n",
     "[here](https://mrfitzpa.github.io/empix/_autosummary/empix.html). It is\n",
     "recommended that you consult the documentation of this library as you explore\n",
     "the notebook. Moreover, users should execute the cells in the order that they\n",
     "appear, i.e. from top to bottom, as some cells reference variables that are set\n",
-    "in other cells above them. **Users should make sure to navigate the documentation\n",
-    "for the version of emicroml that they are currently using.**\n",
+    "in other cells above them. **Users should make sure to navigate the\n",
+    "documentation for the version of ``empix`` that they are currently using.**\n",
     "\n",
     "The last module that we imported above (i.e. the module with the alias helpers)\n",
     "contains helper functions that are used throughout the remainder of the\n",
@@ -145,7 +145,7 @@
     "not essential that users know the implementation details of these helper\n",
     "functions in order to follow the logic of each cell in the remainder of this\n",
     "notebook. Moreover, users need not import this module for their own applications\n",
-    "of emicroml. That being said, if any users are interested in the implementation\n",
+    "of ``empix``. That being said, if any users are interested in the implementation\n",
     "details, they can find them in the file\n",
     "`<root>/examples/helpers_for_basic_usage.py`."
    ]

{empix-0.0.9 → empix-0.0.10}/examples/helpers_for_basic_usage.py

@@ -23,7 +23,7 @@
 ## Load libraries/packages/modules ##
 #####################################
 
-# For general array handling and constructing random number generators.
+# For general array handling.
 import numpy as np
 
 # For creating hyperspy signals.

{empix-0.0.9 → empix-0.0.10}/pyproject.toml

@@ -41,7 +41,8 @@ dependencies = [
     "fancytypes>=1.0.0",
     "hyperspy",
     "pyFAI",
-    "numba"
+    "numba",
+    "scikit-image"
 ]
 requires-python = ">=3.8"