diff --git a/trackpy/dev/.buildinfo b/trackpy/dev/.buildinfo index f5f0992b..b5a782c0 100644 --- a/trackpy/dev/.buildinfo +++ b/trackpy/dev/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: d3c254abaeee09d9396b83fc148bdcec +config: a381ef82ffa281ccad741d37d40d9c4c tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/trackpy/dev/_sources/installation.rst.txt b/trackpy/dev/_sources/installation.rst.txt index 0316425f..c8390cdb 100644 --- a/trackpy/dev/_sources/installation.rst.txt +++ b/trackpy/dev/_sources/installation.rst.txt @@ -66,13 +66,14 @@ run this in the command prompt: Latest Version Under Development ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The `master` branch on github contains the latest tested development code. -Changes are thoroughly tested before being merged. If you want to use the -latest features it should be safe to rely on the master branch. -(The primary contributors do.) +The ``master`` branch on GitHub contains the latest tested development code. +Sometimes this branch will be compatible with the very latest versions of +other packages (especially pandas or scipy) weeks or months before a new +stable version is released. Code in this branch has already been thoroughly +tested. You can easily install a recent build by downloading the source from -`Github `_: +`GitHub `_: .. code-block:: bash @@ -90,7 +91,7 @@ environment with the name softmatter as follows: .. code-block:: bash - conda create --name softmatter python=3.7 trackpy nb_conda + conda create --name softmatter trackpy nb_conda The `nb_conda` is optional, but we added it to ensure that Jupyter sees this environment as well. You can switch to the environment from within Jupyter in @@ -117,11 +118,13 @@ pip """ We strongly recommend using conda to install trackpy, as described above, -but pip is also supported. +but pip is also supported. In general, you can use the latest version of each dependency. +If you wish to override trackpy's minimum version requirements, you may find that +trackpy still runs your analysis code with older versions of dependencies. Essential Dependencies: -* Python 3.7 or newer. (trackpy on Python 2.7 and older Python 3.x is no longer officially supported, though it is still likely to run.) +* Python 3 * `setuptools `__ * `numpy `__ * `scipy `__ diff --git a/trackpy/dev/_static/documentation_options.js b/trackpy/dev/_static/documentation_options.js index 038e6439..ca7c30eb 100644 --- a/trackpy/dev/_static/documentation_options.js +++ b/trackpy/dev/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '0.6.2rc1', + VERSION: '0.6.2rc1+1.gc976867', LANGUAGE: 'en', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/trackpy/dev/api.html b/trackpy/dev/api.html index 39880c24..96cf5687 100644 --- a/trackpy/dev/api.html +++ b/trackpy/dev/api.html @@ -5,7 +5,7 @@ - API reference — trackpy 0.6.2rc1 documentation + API reference — trackpy 0.6.2rc1+1.gc976867 documentation @@ -39,7 +39,7 @@ trackpy - 0.6.2rc1 + 0.6.2rc1+1.gc976867