Merge pull request #135 from moorepants/version-1.4.0

Version 1.4.0

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2017, Christopher Lee Dembia
+Copyright (c) 2011-2022, Christopher Lee Dembia
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.rst

@@ -2,23 +2,25 @@ yeadon
 ======
 
 .. image:: https://img.shields.io/pypi/v/yeadon.svg
-    :target: https://pypi.python.org/pypi/yeadon/
-    :alt: Latest PyPI version
+   :target: https://pypi.python.org/pypi/yeadon/
+   :alt: Latest PyPI version
 
 .. image:: https://img.shields.io/pypi/dm/yeadon.svg
-    :target: https://pypi.python.org/pypi/yeadon/
-    :alt: Number of PyPI downloads
+   :target: https://pypi.python.org/pypi/yeadon/
+   :alt: Number of PyPI downloads
+
+.. image:: https://anaconda.org/conda-forge/yeadon/badges/version.svg
+   :target: https://anaconda.org/conda-forge/yeadon
 
 .. image:: https://readthedocs.org/projects/yeadon/badge/?version=latest
-    :alt: Documentation Status
-    :scale: 100%
-    :target: https://yeadon.readthedocs.org/en/latest/?badge=latest
+   :alt: Documentation Status
+   :scale: 100%
+   :target: https://yeadon.readthedocs.org/en/latest/?badge=latest
 
 .. image:: https://zenodo.org/badge/doi/10.5281/zenodo.15770.svg
-    :target: http://dx.doi.org/10.5281/zenodo.15770
+   :target: http://dx.doi.org/10.5281/zenodo.15770
 
-.. image:: https://travis-ci.org/chrisdembia/yeadon.png?branch=master
-    :target: https://travis-ci.org/chrisdembia/yeadon
+.. image:: https://github.com/chrisdembia/yeadon/actions/workflows/runtests.yml/badge.svg
 
 This package calculates the masses, center of mass positions, and inertia
 tensors that correspond to the human inertia model developed by Yeadon in
@@ -44,7 +46,7 @@ Directories
 Installing
 ==========
 
-This package was developed for Python 2.7 and Python 3.3+.
+This package was developed for Python 3.7+.
 
 Dependencies
 ------------
@@ -78,10 +80,10 @@ Option 1: Scientific python distributions
 `````````````````````````````````````````
 
 Most `scientific python distributions
-<http://www.scipy.org/install.html#scientific-python-distributions>`_ provide all of these
-dependencies and it is often easiest to install one of them to get started. Once
-you have a distribution, you simply need to install the yeadon package. This is
-the best solution for Windows users.
+<http://www.scipy.org/install.html#scientific-python-distributions>`_ provide
+all of these dependencies and it is often easiest to install one of them to get
+started. Once you have a distribution, you can install the yeadon package. This
+is the best solution for Windows users.
 
 Option 2: Operating system package manager
 ``````````````````````````````````````````
@@ -92,9 +94,8 @@ be able to obtain all of these packages by opening a terminal window and
 typing::
 
    $ # prepend sudo to each line below if you desire a system install
-   $ apt-get install python-setuptools python-numpy python-yaml # required
-   $ apt-get install python-nose python-sphinx mayavi2 # optional packages
-   $ easy_install numpydoc # this package is not in the Debian repositories
+   $ apt-get install python3-setuptools python3-numpy python3-yaml # required
+   $ apt-get install python3-nose python3-sphinx python3-numpydoc mayavi2 # optional packages
 
 For other operating systems (e.g. Windows or Mac), visit the websites for the
 packages for installation instructions.
@@ -106,10 +107,9 @@ This option is required if you want to use `yeadon` in a virtualenv. You can
 build the dependencies from source and then install them by using a tool like
 `pip`::
 
-    $ easy_install pip
-    $ pip install numpy PyYAML
-    $ pip install nose sphinx mayavi
-    $ pip install numpydoc
+    $ python -m pip install numpy PyYAML
+    $ python -m pip install nose sphinx mayavi
+    $ python -m pip install numpydoc
 
 or you can obtain the source code, perhaps from GitHub_, and install the
 packages manually.
@@ -123,7 +123,7 @@ Once you've obtained the dependencies, you can install `yeadon`. The
 easiest way to download and install the `yeadon` package is by using a tool
 like `pip` to obtain the package from the Python Package Index (PyPi)::
 
-   $ pip install yeadon # sudo if system install
+   $ python -m pip install yeadon # sudo if system install
 
 You can also obtain an archive of the package at the Python Package Index
 (`<https://pypi.python.org/pypi/yeadon>`_), and then install the package on your
@@ -140,9 +140,6 @@ your terminal::
    $ cd yeadon-X.X.X.tar.gz
    $ python setup.py install # sudo if system install
 
-Both of these options assume that the version of your default Python
-interpreter is 2.7.
-
 Run the tests with::
 
    $ python setup.py nosetests
@@ -222,9 +219,9 @@ Cite us!
 If you make use of the yeadon software we would welcome a citation in your
 publications. Please cite this software paper:
 
-   Dembia C, Moore JK and Hubbard M. An object oriented implementation of the
-   Yeadon human inertia model, F1000Research 2014, 3:223 (doi:
-   10.12688/f1000research.5292.1)
+Dembia C, Moore JK and Hubbard M. An object oriented implementation of the
+Yeadon human inertia model, F1000Research 2014, 3:223 (doi:
+https://dx.doi.org/10.12688/f1000research.5292.1)
 
 Contact
 =======

doc/conf.py

@@ -58,7 +58,7 @@
 
 # General information about the project.
 project = u'yeadon'
-copyright = u'2011-2016, Chris Dembia'
+copyright = u'2011-2022, Chris Dembia'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

doc/releasenotes.rst

@@ -5,6 +5,13 @@ Future releases
 ---------------
 See issues on github at `<https://github.com/chrisdembia/yeadon/issues>`_.
 
+v1.4.0
+------
+
+- Dropped support for Python < 3.7 (including 2.7).
+- Replaced ``yaml.load`` with ``yaml.safe_load``.
+- Fixed pretty printing of results to work with newer NumPy versions.
+
 v1.3.0
 ------
 

requirements.txt

@@ -1,3 +1,3 @@
-numpy
-pyyaml
-numpydoc
+numpy>=1.16.5
+pyyaml>=5.3.1
+numpydoc>=0.7.0

setup.py

@@ -15,22 +15,23 @@
     keywords="human inertia yeadon sports biomechanics gymnastics",
     license='LICENSE.txt',
     packages=find_packages(),
-    install_requires=['numpy>=1.6.1',
-                      'pyyaml>=3.10'],
-    extras_require={'gui': ['mayavi>=4.0'],
-                    'doc': ['sphinx', 'numpydoc']},
-    tests_require=['nose'],
+    # NOTE : The minimum versions correspond to those in Ubuntu 20.04 LTS.
+    install_requires=['numpy>=1.16.5',
+                      'pyyaml>=5.3.1'],
+    extras_require={'gui': ['mayavi>=4.7.1'],
+                    'doc': ['sphinx>=1.8.5', 'numpydoc>=0.7.0']},
+    tests_require=['nose>=1.3.7'],
     test_suite='nose.collector',
     include_package_data=True,
     scripts=['bin/yeadon'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Science/Research',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Topic :: Scientific/Engineering :: Physics',
         ],
 )

yeadon-dev-env.yml

@@ -1,11 +1,12 @@
 name: yeadon-dev
 channels:
   - conda-forge
+# NOTE : The minimum versions correspond to those in Ubuntu 20.04 LTS.
 dependencies:
-  - coverage
-  - nose
-  - numpy >=1.6.1
-  - numpydoc
-  - pyyaml >=3.10
-  - setuptools
-  - sphinx
+  - coverage >=4.5.2
+  - nose >=1.3.7
+  - numpy >=1.16.5
+  - numpydoc >=0.7.0
+  - pyyaml >=5.3.1
+  - setuptools >=44.0.0
+  - sphinx >=1.8.5

yeadon/human.py

@@ -4,8 +4,6 @@
 
 """
 
-# Use Python3 integer division rules.
-from __future__ import division
 import copy
 import warnings
 

yeadon/inertia.py

@@ -1,6 +1,3 @@
-# Use Python3 integer division rules.
-from __future__ import division
-
 import warnings
 
 import numpy as np

yeadon/segment.py

@@ -4,9 +4,6 @@
 user does not interact with this module.
 
 """
-# Use Python3 integer division rules.
-from __future__ import division
-
 # external imports
 import numpy as np
 

yeadon/solid.py

@@ -5,8 +5,6 @@ class definition for stadium objects, which are used to construct
 Semiellipsoid classes.
 
 """
-# Use Python3 integer division rules.
-from __future__ import division
 import warnings
 
 import numpy as np

yeadon/tests/test_human.py

@@ -3,10 +3,7 @@
 import os
 import warnings
 # For redirecting stdout.
-if (sys.version_info > (3, 0)):
-    from io import StringIO
-else:
-    from cStringIO import StringIO
+from io import StringIO
 
 import unittest
 import nose

yeadon/tests/test_segment.py

@@ -2,10 +2,7 @@
 import os
 import warnings
 # For redirecting stdout.
-if (sys.version_info > (3, 0)):
-    from io import StringIO
-else:
-    from cStringIO import StringIO
+from io import StringIO
 
 import unittest
 import numpy as np

yeadon/tests/test_solid.py

@@ -1,8 +1,5 @@
 #!/usr/bin/env python
 
-# Use Python3 integer division rules.
-from __future__ import division
-
 import sys
 import os
 import unittest