[python-control-developers] [python-control/python-control] 09a715: Simplify setup.py and automatic version generation

[Clancy R. <cl...@gm...>]

  Branch: refs/heads/master
  Home:   https://github.com/python-control/python-control
  Commit: 09a715377a868a1f46b7266bc8af58b932d1999e
      https://github.com/python-control/python-control/commit/09a715377a868a1f46b7266bc8af58b932d1999e
  Author: Clancy Rowley <cwr...@pr...>
  Date:   2015-04-03 (Fri, 03 Apr 2015)

  Changed paths:
    M .gitignore
    M .travis.yml
    M control/__init__.py
    A make_version.py
    M setup.py

  Log Message:
  -----------
  Simplify setup.py and automatic version generation

There was a lot of unnecessarily complex logic in setup.py, taken from
numpy, about whether to use setuptools or distutils.  In addition, the
procedure for generating the version information was only partially
automatic (one still needed to change the version manually in setup.py),
and was somewhat unreliable (see issue #37).

This commit simplifies setup.py, always using setuptools, as recommended
in the Python Packaging Guide:
    http://python-packaging-user-guide.readthedocs.org/en/latest/current.html
The version information is now generated directly from tags in the git
repository.  Now, *before* running setup.py, one runs
    python make_version.py
and this generates a file with the version information.  This is copied
from binstar (https://github.com/Binstar/binstar) and seems to work well.


  Commit: 7f937266aec38f13ca77b9cb0b436d09f752a515
      https://github.com/python-control/python-control/commit/7f937266aec38f13ca77b9cb0b436d09f752a515
  Author: Clancy Rowley <cwr...@pr...>
  Date:   2015-04-03 (Fri, 03 Apr 2015)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Update and improve README


  Commit: 688d1f6feae72c396f101af08b85b5f94c992a6f
      https://github.com/python-control/python-control/commit/688d1f6feae72c396f101af08b85b5f94c992a6f
  Author: Clancy Rowley <cwr...@pr...>
  Date:   2015-04-03 (Fri, 03 Apr 2015)

  Changed paths:
    M control/tests/freqresp.py

  Log Message:
  -----------
  Fix print statement in tests/freqresp.py for py3


  Commit: 6d337541fa6e48753105295d59f1b9abc2cc36d0
      https://github.com/python-control/python-control/commit/6d337541fa6e48753105295d59f1b9abc2cc36d0
  Author: Clancy Rowley <cwr...@pr...>
  Date:   2015-04-03 (Fri, 03 Apr 2015)

  Changed paths:
    M .gitignore
    A conda-recipe/bld.bat
    A conda-recipe/meta.yaml
    M make_version.py

  Log Message:
  -----------
  Add conda recipe

To build the conda package:
  conda build conda-recipe

Note that the version is automatically set according to the files
generated by make_version.py, which is automatically run by the recipe


  Commit: 4a35d468f16f367fdc6c54ce555682f6a576d846
      https://github.com/python-control/python-control/commit/4a35d468f16f367fdc6c54ce555682f6a576d846
  Author: Clancy Rowley <cwr...@pr...>
  Date:   2015-04-03 (Fri, 03 Apr 2015)

  Changed paths:
    M .travis.yml
    M conda-recipe/meta.yaml

  Log Message:
  -----------
  Modify travis build to test conda recipe


  Commit: 5ff196c860909d18707ccdd2f85a89a4b531150c
      https://github.com/python-control/python-control/commit/5ff196c860909d18707ccdd2f85a89a4b531150c
  Author: Clancy Rowley <cwr...@pr...>
  Date:   2015-04-03 (Fri, 03 Apr 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Install slycot from binstar in Travis CI

The majority of time in the Travis CI testing was spent installing
slycot from source.  (This also required installing a fortran compiler
as part of the Travis build.)  Installing from a binary saves a lot of
time.


  Commit: 15fd5c1e8015e5bdfd748ccac4a36252d1725ae5
      https://github.com/python-control/python-control/commit/15fd5c1e8015e5bdfd748ccac4a36252d1725ae5
  Author: Clancy Rowley <cl...@gm...>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M .gitignore
    M .travis.yml
    M README.rst
    A conda-recipe/bld.bat
    A conda-recipe/meta.yaml
    M control/__init__.py
    M control/tests/freqresp.py
    A make_version.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #52 from cwrowley/conda-build

Add conda build recipe and improve version numbering


Compare: https://github.com/python-control/python-control/compare/9671fe3b03f4...15fd5c1e8015