@@ -66,13 +66,14 @@ run this in the command prompt:
6666 Latest Version Under Development
6767^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6868
69- The `master ` branch on github contains the latest tested development code.
70- Changes are thoroughly tested before being merged. If you want to use the
71- latest features it should be safe to rely on the master branch.
72- (The primary contributors do.)
69+ The ``master `` branch on GitHub contains the latest tested development code.
70+ Sometimes this branch will be compatible with the very latest versions of
71+ other packages (especially pandas or scipy) weeks or months before a new
72+ stable version is released. Code in this branch has already been thoroughly
73+ tested.
7374
7475You can easily install a recent build by downloading the source from
75- `Github <https://github.com/soft-matter/trackpy >`_:
76+ `GitHub <https://github.com/soft-matter/trackpy >`_:
7677
7778.. code-block :: bash
7879
@@ -90,7 +91,7 @@ environment with the name softmatter as follows:
9091
9192.. code-block :: bash
9293
93- conda create --name softmatter python=3.7 trackpy nb_conda
94+ conda create --name softmatter trackpy nb_conda
9495
9596 The `nb_conda ` is optional, but we added it to ensure that Jupyter sees this
9697environment as well. You can switch to the environment from within Jupyter in
@@ -117,11 +118,13 @@ pip
117118"""
118119
119120We strongly recommend using conda to install trackpy, as described above,
120- but pip is also supported.
121+ but pip is also supported. In general, you can use the latest version of each dependency.
122+ If you wish to override trackpy's minimum version requirements, you may find that
123+ trackpy still runs your analysis code with older versions of dependencies.
121124
122125Essential Dependencies:
123126
124- * 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.)
127+ * Python 3
125128* `setuptools <http://pythonhosted.org/setuptools/ >`__
126129* `numpy <http://www.scipy.org/ >`__
127130* `scipy <http://www.scipy.org/ >`__
0 commit comments