[med-svn] [python-cobra] 01/02: Merge tag 'debian/0.4.2_b1-1' into debian/jessie-backports

[Afif Elghraoui]

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

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

commit 44e17231b8afb58bee605a0f9f5ae4212125dd57
Merge: a4fafbb 03e31a5
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Jul 23 15:20:06 2016 -0700

    Merge tag 'debian/0.4.2_b1-1' into debian/jessie-backports
    
    python-cobra (0.4.2~b1-1) unstable; urgency=medium
    
      * Imported Upstream version 0.4.2~b1
      * Refresh patches
      * Use Make to drive autopkgtests and document some rationale
      * Clean up d/control and d/rules
      * Include jsonschema and pandas to run additional CI tests
    
    Conflicts:
    	debian/rules

 .gitignore                           |   1 +
 INSTALL.md                           |  11 +--
 README.md                            |   7 +-
 appveyor.yml                         |  20 +++--
 appveyor/build_glpk.py               |   4 +-
 cobra/VERSION                        |   2 +-
 cobra/core/DictList.py               |   4 +-
 cobra/io/json.py                     |   4 +-
 cobra/io/mat.py                      |  10 ++-
 cobra/io/sbml.py                     |   5 ++
 cobra/manipulation/modify.py         |  52 +++++++++++-
 cobra/solvers/gurobi_solver.py       |   5 +-
 cobra/solvers/mosek.py               |   2 +
 cobra/test/flux_analysis.py          |  42 ++++++----
 cobra/test/manipulation.py           |  25 ++++++
 cobra/test/solvers.py                |   2 +-
 debian/changelog                     |  19 +++++
 debian/control                       |  67 ++++++++-------
 debian/patches/reproducible.patch    |  15 ++++
 debian/patches/series                |   1 +
 debian/rules                         |   8 +-
 debian/tests/Makefile                |  13 +++
 debian/tests/control                 |  17 +++-
 documentation_builder/loopless.ipynb | 156 +++++++++++++++++++++++++----------
 ez_setup.py                          |  77 ++++++++++++-----
 setup.py                             |   4 +-
 26 files changed, 421 insertions(+), 152 deletions(-)

diff --cc debian/changelog
index 6ce4c54,f69f6dc..1ea6770
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,22 +1,28 @@@
+ python-cobra (0.4.2~b1-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 0.4.2~b1
+   * Refresh patches
+   * Use Make to drive autopkgtests and document some rationale
+   * Clean up d/control and d/rules
+   * Include jsonschema and pandas to run additional CI tests
+ 
+  -- Afif Elghraoui <afif at debian.org>  Sun, 17 Jul 2016 16:43:42 -0700
+ 
+ python-cobra (0.4.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Make build reproducible.
+     - Ensure stable ordering for required dependencies.
+   * Bump Standards-Version.
+ 
+  -- Sascha Steinbiss <sascha at steinbiss.name>  Wed, 01 Jun 2016 14:47:03 +0000
+ 
 +python-cobra (0.4.1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Afif Elghraoui <afif at debian.org>  Wed, 30 Mar 2016 23:18:14 -0700
 +
  python-cobra (0.4.1-1) unstable; urgency=medium
  
    * Imported Upstream version 0.4.1
diff --cc debian/rules
index 963f5cf,d823bcf..21eee84
--- a/debian/rules
+++ b/debian/rules
@@@ -1,15 -1,13 +1,15 @@@
  #!/usr/bin/make -f
+ 
  #DH_VERBOSE = 1
+ #include /usr/share/dpkg/default.mk
+ export LC_ALL=C.UTF-8
  export PYBUILD_NAME=cobra
  
 +export PYBUILD_VERSIONS=2.7 3.4
 +export PYBUILD_INTERPRETERS=python{version}
  
- DPKG_EXPORT_BUILDFLAGS = 1
- include /usr/share/dpkg/default.mk
- 
  %:
- 	LC_ALL=C.UTF-8 dh $@ --with python2,python3 --buildsystem=pybuild
+ 	dh $@ --with python2,python3 --buildsystem=pybuild
  
  # Disable building of documentation (see README.source)
  #override_dh_auto_build:

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