diff --git a/.gitignore b/.gitignore index 0dbc783..63f1d05 100644 --- a/.gitignore +++ b/.gitignore @@ -84,6 +84,9 @@ target/ # VSCode .vscode +# PyCharm +.idea + # pyenv .python-version diff --git a/Makefile b/Makefile index 3ba3b1a..35d91db 100644 --- a/Makefile +++ b/Makefile @@ -237,10 +237,10 @@ release_pip_osx: @ echo "# Creating osx compliant package (pip) #" @ echo "#-----------------------------------------------#" @ mkdir -p wheels - @ conda create -n python_dev_38 python=3.8 -y; \ - conda activate python_dev_38 ; \ + @ conda create -n python_dev_39 python=3.9 -y; \ + conda activate python_dev_39 ; \ pip install -r requirements.txt ; \ - rm -rf dist build; python3.8 setup.py bdist_wheel ; \ + rm -rf dist build; python3.9 setup.py bdist_wheel ; \ cp dist/*whl wheels ; \ rm -rf dist build diff --git a/docs/_images/example_02.png b/docs/_images/example_02.png index bd5e012..0631793 100644 Binary files a/docs/_images/example_02.png and b/docs/_images/example_02.png differ diff --git a/docs/_images/example_05.png b/docs/_images/example_05.png index 7f11837..472bc48 100644 Binary files a/docs/_images/example_05.png and b/docs/_images/example_05.png differ diff --git a/docs/_images/example_06.png b/docs/_images/example_06.png index 59d173c..3029105 100644 Binary files a/docs/_images/example_06.png and b/docs/_images/example_06.png differ diff --git a/docs/_images/example_06b.png b/docs/_images/example_06b.png index e9b98e0..d3828de 100644 Binary files a/docs/_images/example_06b.png and b/docs/_images/example_06b.png differ diff --git a/docs/_images/example_07.png b/docs/_images/example_07.png index 7a41f5b..a3af2de 100644 Binary files a/docs/_images/example_07.png and b/docs/_images/example_07.png differ diff --git a/docs/_images/example_08.png b/docs/_images/example_08.png index ca569cc..e117925 100644 Binary files a/docs/_images/example_08.png and b/docs/_images/example_08.png differ diff --git a/docs/_images/example_13.png b/docs/_images/example_13.png index a0c48af..6ab41f5 100644 Binary files a/docs/_images/example_13.png and b/docs/_images/example_13.png differ diff --git a/docs/_static/basic.css b/docs/_static/basic.css index aa9df31..bf18350 100644 --- a/docs/_static/basic.css +++ b/docs/_static/basic.css @@ -4,7 +4,7 @@ * * Sphinx stylesheet -- basic theme. * - * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ @@ -731,8 +731,9 @@ dl.glossary dt { .classifier:before { font-style: normal; - margin: 0.5em; + margin: 0 0.5em; content: ":"; + display: inline-block; } abbr, acronym { @@ -756,6 +757,7 @@ span.pre { -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; + white-space: nowrap; } div[class*="highlight-"] { @@ -819,7 +821,7 @@ div.code-block-caption code { table.highlighttable td.linenos, span.linenos, -div.doctest > div.highlight span.gp { /* gp: Generic.Prompt */ +div.highlight span.gp { /* gp: Generic.Prompt */ user-select: none; -webkit-user-select: text; /* Safari fallback only */ -webkit-user-select: none; /* Chrome/Safari */ diff --git a/docs/_static/doctools.js b/docs/_static/doctools.js index 61ac9d2..e509e48 100644 --- a/docs/_static/doctools.js +++ b/docs/_static/doctools.js @@ -4,7 +4,7 @@ * * Sphinx JavaScript utilities for all documentation. * - * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ @@ -264,6 +264,9 @@ var Documentation = { hideSearchWords : function() { $('#searchbox .highlight-link').fadeOut(300); $('span.highlighted').removeClass('highlighted'); + var url = new URL(window.location); + url.searchParams.delete('highlight'); + window.history.replaceState({}, '', url); }, /** @@ -301,12 +304,14 @@ var Documentation = { window.location.href = prevHref; return false; } + break; case 39: // right var nextHref = $('link[rel="next"]').prop('href'); if (nextHref) { window.location.href = nextHref; return false; } + break; } } }); diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index b859b47..65f6a1c 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '1.5.3', + VERSION: '1.6.0', LANGUAGE: 'en', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/_static/example_01.png b/docs/_static/example_01.png index 1b4d486..963135a 100644 Binary files a/docs/_static/example_01.png and b/docs/_static/example_01.png differ diff --git a/docs/_static/example_01b.png b/docs/_static/example_01b.png index 9eeb98a..7423ae0 100644 Binary files a/docs/_static/example_01b.png and b/docs/_static/example_01b.png differ diff --git a/docs/_static/example_02.png b/docs/_static/example_02.png index 0631793..5894045 100644 Binary files a/docs/_static/example_02.png and b/docs/_static/example_02.png differ diff --git a/docs/_static/example_05.png b/docs/_static/example_05.png index 472bc48..575c2e8 100644 Binary files a/docs/_static/example_05.png and b/docs/_static/example_05.png differ diff --git a/docs/_static/example_06.png b/docs/_static/example_06.png index 3029105..1b5b76f 100644 Binary files a/docs/_static/example_06.png and b/docs/_static/example_06.png differ diff --git a/docs/_static/example_06b.png b/docs/_static/example_06b.png index d3828de..b5598fe 100644 Binary files a/docs/_static/example_06b.png and b/docs/_static/example_06b.png differ diff --git a/docs/_static/example_07.png b/docs/_static/example_07.png index a3af2de..818934e 100644 Binary files a/docs/_static/example_07.png and b/docs/_static/example_07.png differ diff --git a/docs/_static/example_08.png b/docs/_static/example_08.png index e117925..0c2fe31 100644 Binary files a/docs/_static/example_08.png and b/docs/_static/example_08.png differ diff --git a/docs/_static/example_13.png b/docs/_static/example_13.png index 6ab41f5..9b95a65 100644 Binary files a/docs/_static/example_13.png and b/docs/_static/example_13.png differ diff --git a/docs/_static/example_pa_01.pdf b/docs/_static/example_pa_01.pdf index 0b2f1ff..7ffe21e 100644 Binary files a/docs/_static/example_pa_01.pdf and b/docs/_static/example_pa_01.pdf differ diff --git a/docs/_static/example_pa_02.pdf b/docs/_static/example_pa_02.pdf index 30982b3..72f3df3 100644 Binary files a/docs/_static/example_pa_02.pdf and b/docs/_static/example_pa_02.pdf differ diff --git a/docs/_static/example_pa_03.pdf b/docs/_static/example_pa_03.pdf index 9dcac00..4e7fb52 100644 Binary files a/docs/_static/example_pa_03.pdf and b/docs/_static/example_pa_03.pdf differ diff --git a/docs/_static/example_pa_04.pdf b/docs/_static/example_pa_04.pdf index 3e6fed2..49c057e 100644 Binary files a/docs/_static/example_pa_04.pdf and b/docs/_static/example_pa_04.pdf differ diff --git a/docs/_static/language_data.js b/docs/_static/language_data.js index 863704b..ebe2f03 100644 --- a/docs/_static/language_data.js +++ b/docs/_static/language_data.js @@ -5,7 +5,7 @@ * This script contains the language-specific data used by searchtools.js, * namely the list of stopwords, stemmer, scorer and splitter. * - * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ diff --git a/docs/_static/merge_ologram_stats_01.pdf b/docs/_static/merge_ologram_stats_01.pdf index 6fb2ee4..b13fcfc 100644 Binary files a/docs/_static/merge_ologram_stats_01.pdf and b/docs/_static/merge_ologram_stats_01.pdf differ diff --git a/docs/_static/nature.css b/docs/_static/nature.css index c4768af..beb3a60 100644 --- a/docs/_static/nature.css +++ b/docs/_static/nature.css @@ -4,7 +4,7 @@ * * Sphinx stylesheet -- nature theme. * - * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ diff --git a/docs/_static/searchtools.js b/docs/_static/searchtools.js index e09f926..2d77859 100644 --- a/docs/_static/searchtools.js +++ b/docs/_static/searchtools.js @@ -4,7 +4,7 @@ * * Sphinx JavaScript utilities for the full-text search. * - * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ @@ -282,7 +282,10 @@ var Search = { complete: function(jqxhr, textstatus) { var data = jqxhr.responseText; if (data !== '' && data !== undefined) { - listItem.append(Search.makeSearchSummary(data, searchterms, hlterms)); + var summary = Search.makeSearchSummary(data, searchterms, hlterms); + if (summary) { + listItem.append(summary); + } } Search.output.append(listItem); setTimeout(function() { @@ -325,7 +328,9 @@ var Search = { var results = []; for (var prefix in objects) { - for (var name in objects[prefix]) { + for (var iMatch = 0; iMatch != objects[prefix].length; ++iMatch) { + var match = objects[prefix][iMatch]; + var name = match[4]; var fullname = (prefix ? prefix + '.' : '') + name; var fullnameLower = fullname.toLowerCase() if (fullnameLower.indexOf(object) > -1) { @@ -339,7 +344,6 @@ var Search = { } else if (parts[parts.length - 1].indexOf(object) > -1) { score += Scorer.objPartialMatch; } - var match = objects[prefix][name]; var objname = objnames[match[1]][2]; var title = titles[match[0]]; // If more than one term searched for, we require other words to be @@ -498,6 +502,9 @@ var Search = { */ makeSearchSummary : function(htmlText, keywords, hlwords) { var text = Search.htmlToText(htmlText); + if (text == "") { + return null; + } var textLower = text.toLowerCase(); var start = 0; $.each(keywords, function() { diff --git a/docs/_static/treeified.pdf b/docs/_static/treeified.pdf index f5f6263..c781d5e 100644 Binary files a/docs/_static/treeified.pdf and b/docs/_static/treeified.pdf differ diff --git a/docs/about.html b/docs/about.html index 3cbff43..febd99a 100644 --- a/docs/about.html +++ b/docs/about.html @@ -17,7 +17,7 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -