[med-svn] [python-cobra] 01/02: Merge branch 'master' into debian/jessie-backports

[Afif Elghraoui]

This is an automated email from the git hooks/post-receive script.

afif-guest pushed a commit to branch debian/jessie-backports
in repository python-cobra.

commit e1c010112d998393c5a84416c94faf8d13940072
Merge: 992446c b007f57
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Fri Sep 4 19:08:41 2015 -0700

    Merge branch 'master' into debian/jessie-backports

 .travis.yml                                     | 25 ++++++--
 INSTALL.md                                      | 33 ++++++-----
 README.md                                       |  5 ++
 cobra/VERSION                                   |  2 +-
 cobra/flux_analysis/deletion_worker.py          |  2 +-
 cobra/flux_analysis/phenotype_phase_plane.py    | 26 ++++-----
 cobra/io/__init__.py                            | 27 ++++-----
 cobra/io/mat.py                                 |  3 +-
 cobra/solvers/cglpk.pyx                         | 76 +++++++++++++------------
 cobra/test/__init__.py                          |  5 +-
 cobra/test/flux_analysis.py                     |  9 +++
 debian/changelog                                |  9 +++
 debian/patches/series                           |  1 -
 debian/patches/test-suite-return-code.patch     | 24 --------
 debian/patches/testsuite-check-jsonschema.patch |  2 +-
 debian/tests/control                            |  4 +-
 setup.py                                        | 12 +++-
 17 files changed, 141 insertions(+), 124 deletions(-)

diff --cc debian/changelog
index 9a89314,2c92269..fd6503b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ python-cobra (0.4.0b3-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 0.4.0b3
+   * Removed patch that was applied upstream
+   * Adjusted autopkgtest commands
+   * Refreshed quilt patch
+ 
+  -- Afif Elghraoui <afif at ghraoui.name>  Fri, 28 Aug 2015 22:27:50 -0700
+ 
 +python-cobra (0.4.0b2-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Afif Elghraoui <afif at ghraoui.name>  Sat, 15 Aug 2015 23:34:00 -0700
 +
  python-cobra (0.4.0b2-1) unstable; urgency=medium
  
    * Adjust package relationships as requested by upstream

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-cobra.git