empix 0.0.8__tar.gz → 0.0.10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: empix
-Version: 0.0.8
+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
@@ -91,8 +92,8 @@ systems you could open e.g. an Anaconda Prompt as an administrator.
 #### Installing `empix` using `pip`
 
 Before installing `empix`, make sure that you have activated the (virtual)
-environment in which you intend to install said package. After which, simply
-change into the root of the repository, and run the following command:
+environment in which you intend to install said package. After which, simply run
+the following command:
 
     pip install empix
 
@@ -149,12 +150,12 @@ The above command will install the latest stable version of `empix`.
 ### Uninstalling `empix`
 
 If `empix` was installed using `pip`, then to uninstall, run the following
-command from the root of the repository:
+command:
 
     pip uninstall empix
 
 If `empix` was installed using `conda`, then to uninstall, run the
-following command from the root of the repository:
+following command:
 
     conda remove empix
 

{empix-0.0.8 → empix-0.0.10}/README.md

@@ -48,8 +48,8 @@ systems you could open e.g. an Anaconda Prompt as an administrator.
 #### Installing `empix` using `pip`
 
 Before installing `empix`, make sure that you have activated the (virtual)
-environment in which you intend to install said package. After which, simply
-change into the root of the repository, and run the following command:
+environment in which you intend to install said package. After which, simply run
+the following command:
 
     pip install empix
 
@@ -106,12 +106,12 @@ The above command will install the latest stable version of `empix`.
 ### Uninstalling `empix`
 
 If `empix` was installed using `pip`, then to uninstall, run the following
-command from the root of the repository:
+command:
 
     pip uninstall empix
 
 If `empix` was installed using `conda`, then to uninstall, run the
-following command from the root of the repository:
+following command:
 
     conda remove empix
 

{empix-0.0.8 → empix-0.0.10}/docs/INSTALL.rst

@@ -82,11 +82,11 @@ Uninstalling ``empix``
 ----------------------
 
 If ``empix`` was installed using ``pip``, then to uninstall, run the
-following command from the root of the repository::
+following command::
 
   pip uninstall empix
 
 If ``empix`` was installed using ``conda``, then to uninstall, run the
-following command from the root of the repository::
+following command::
 
   conda remove empix

{empix-0.0.8 → 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.8 → 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.8 → empix-0.0.10}/docs/index.rst

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

{empix-0.0.8 → 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.8'
-__version_tuple__ = version_tuple = (0, 0, 8)
+__version__ = version = '0.0.10'
+__version_tuple__ = version_tuple = (0, 0, 10)
 
-__commit_id__ = commit_id = 'ga30344106'
+__commit_id__ = commit_id = 'gdc5580860'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: empix
-Version: 0.0.8
+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
@@ -91,8 +92,8 @@ systems you could open e.g. an Anaconda Prompt as an administrator.
 #### Installing `empix` using `pip`
 
 Before installing `empix`, make sure that you have activated the (virtual)
-environment in which you intend to install said package. After which, simply
-change into the root of the repository, and run the following command:
+environment in which you intend to install said package. After which, simply run
+the following command:
 
     pip install empix
 
@@ -149,12 +150,12 @@ The above command will install the latest stable version of `empix`.
 ### Uninstalling `empix`
 
 If `empix` was installed using `pip`, then to uninstall, run the following
-command from the root of the repository:
+command:
 
     pip uninstall empix
 
 If `empix` was installed using `conda`, then to uninstall, run the
-following command from the root of the repository:
+following command:
 
     conda remove empix
 

{empix-0.0.8 → 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]