From cc845c7919313e674a214a9625dfd53cc539c3b0 Mon Sep 17 00:00:00 2001 From: Andrew Davison Date: Mon, 17 Jul 2017 10:13:26 +0200 Subject: [PATCH] Updates to the documentation --- .gitignore | 2 ++ CHANGES.txt | 33 +++++++++++++++++++++++++++++++++ README.rst | 2 -- conda.recipe/run_test.py | 6 +----- doc/devel/devnotes.rst | 3 +-- doc/user/installation.rst | 12 ++++-------- quantities/tests/common.py | 5 +---- setup.py | 7 ++----- 8 files changed, 44 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 0e10680..051220d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ *.pyc quantities.egg-info build +_build dist .project .pydevproject .settings +.idea diff --git a/CHANGES.txt b/CHANGES.txt index 8d70bb4..83155e3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,39 @@ CHANGES ======= + +----- +0.12.0 +----- + +Removed support for Python 2.6, since NumPy removed support for it as of +version 1.12. Numpy-1.8.2 or later is now required. + +Added more ufuncs: equal, not_equal, less, less_equal, greater, greater_equal + + +Bugs fixed +********** + +https://github.com/python-quantities/python-quantities/issues?utf8=✓&q=is%3Aissue%20is%3Aclosed%20updated%3A2015-12-06..2017-08-01 + + +----- +0.11.0 +----- + +Added many new unit definitions, including aliases for American/British spellings of liter/litre +The Quantity class can now be subclassed. +Supports `np.fabs` +The test suite is now run with Travis CI + + +Bugs fixed +********** + +https://github.com/python-quantities/python-quantities/issues?utf8=✓&q=is%3Aissue%20is%3Aclosed%20updated%3A2011-09-27..2015-12-06 + + ----- 0.10.0 ----- diff --git a/README.rst b/README.rst index 7430066..ab2eca6 100644 --- a/README.rst +++ b/README.rst @@ -6,8 +6,6 @@ quantities .. |pypi version| image:: https://img.shields.io/pypi/v/quantities.png :target: https://pypi.python.org/pypi/quantities -.. |pypi download| image:: https://img.shields.io/pypi/dm/quantities.png - :target: https://pypi.python.org/pypi/quantities .. |Build status| image:: https://secure.travis-ci.org/python-quantities/python-quantities.png?branch=master :target: http://travis-ci.org/python-quantities/python-quantities diff --git a/conda.recipe/run_test.py b/conda.recipe/run_test.py index 60805e8..3939ce7 100644 --- a/conda.recipe/run_test.py +++ b/conda.recipe/run_test.py @@ -1,11 +1,7 @@ import os import sys - -if sys.version.startswith('2.6') or sys.version.startswith('3.1'): - import unittest2 as unittest -else: - import unittest +import unittest suite = unittest.TestLoader().discover('quantities') unittest.TextTestRunner(verbosity=1).run(suite) diff --git a/doc/devel/devnotes.rst b/doc/devel/devnotes.rst index 6d2daec..cacebbb 100644 --- a/doc/devel/devnotes.rst +++ b/doc/devel/devnotes.rst @@ -8,5 +8,4 @@ unittest package. Unit tests can be run with the following:: python setup.py test This works with the version of unittest provided by the python-2.7 and -python-3.2 standard library. If you are running python-2.6 or python-3.1, you -need to install unittest2 to run the test suite. +python-3.2+ standard library. diff --git a/doc/user/installation.rst b/doc/user/installation.rst index 9896442..65c1f9e 100644 --- a/doc/user/installation.rst +++ b/doc/user/installation.rst @@ -8,18 +8,16 @@ Prerequisites Quantities has a few dependencies: -* Python_ (>=2.6) -* NumPy_ (>=1.4) - -If you want to run the test suite on python-2.6 or python-3.1, install the -unittest2_ or unittest2py3k_ package, respectively. +* Python_ (>=2.7) +* NumPy_ (>=1.8.2) Source Code Installation ======================== To install Quantities, download the Quantites sourcecode from PyPi_ -and run "python setup.py install" in the quantities source directory. +and run "python setup.py install" in the quantities source directory, +or run "pip install quantities". Development =========== @@ -35,6 +33,4 @@ website. .. _Python: http://www.python.org/ .. _NumPy: http://www.scipy.org .. _PyPi: http://pypi.python.org/pypi/quantities -.. _unittest2: http://pypi.python.org/pypi/unittest2 -.. _unittest2py3k: http://pypi.python.org/pypi/unittest2py3k .. _github: http://github.com/python-quantities/python-quantities diff --git a/quantities/tests/common.py b/quantities/tests/common.py index 0cdf8c6..68d6c9d 100644 --- a/quantities/tests/common.py +++ b/quantities/tests/common.py @@ -1,8 +1,5 @@ import sys -if sys.version.startswith('2.6') or sys.version.startswith('3.1'): - import unittest2 as unittest -else: - import unittest +import unittest import numpy as np diff --git a/setup.py b/setup.py index 1361a46..efd5323 100755 --- a/setup.py +++ b/setup.py @@ -85,10 +85,7 @@ def finalize_options(self): def run(self): import sys - if sys.version.startswith('2.6') or sys.version.startswith('3.1'): - import unittest2 as unittest - else: - import unittest + import unittest suite = unittest.TestLoader().discover('.') global TEST_RESULT TEST_RESULT = unittest.TextTestRunner(verbosity=self.verbosity+1).run(suite) @@ -139,7 +136,7 @@ def run(self): packages = packages, platforms = 'Any', requires = [ - 'python (>=2.6.0)', + 'python (>=2.7.0)', 'numpy (>=1.8.2)', ], url = 'http://packages.python.org/quantities',