[med-svn] [Git][med-team/toil][master] 4 commits: remove recommend on "python3-futures"

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / toil


Commits:
1eb0fb2b by Michael R. Crusoe at 2019-01-14T07:24:15Z
remove recommend on "python3-futures"

and depends on pytest*

- - - - -
76d73969 by Michael R. Crusoe at 2019-01-14T07:24:40Z
Refined the package description, added 'Provides: cwl-runner'

- - - - -
c4eed1cc by Michael R. Crusoe at 2019-01-14T07:24:42Z
Use Debian's newer python3-{psutil,protobuf}

But disable the mesos helper until python3-mesos is packaged

- - - - -
4028fdb2 by Michael R. Crusoe at 2019-01-14T07:25:28Z
Upload to unstable.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/soften-mesos-deps
- + debian/patches/soften-pytest-depends
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+toil (3.18.0-2) unstable; urgency=medium
+
+  * Remove errant recommend on python3-futures and depends on python3-pytest*
+    (Closes: #919228)
+  * Refined the package description, added 'Provides: cwl-runner'
+  * Remove the partial mesos support until python3-mesos is packaged
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sun, 13 Jan 2019 23:25:16 -0800
+
 toil (3.18.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #851365)


=====================================
debian/control
=====================================
@@ -24,20 +24,24 @@ Vcs-Browser: https://salsa.debian.org/med-team/toil
 
 Package: toil
 Architecture: all
+Provides: cwl-runner
 Depends: ${python3:Depends}, ${misc:Depends},
          cwltool
 Recommends:
          python3-boto, python3-boto3,
-         python3-protobuf,
-         python3-futures,
+# for google cloud support
          python3-libcloud
+# for mesos support, but needs python3-mesos first
+#         python3-protobuf,
 Suggests: python3-azure, python3-azure-storage
 #Suggests: python-toil-doc
 Description: cross-platform workflow engine
  Toil is a scalable, efficient, cross-platform and easy-to-use workflow
  engine in pure Python.  It works with several well established load
- balancers like Slurm or the Sun Grid Engine.  Toil is compatible with
- the Common Workflow Language (CWL).
+ balancers like Slurm or the Sun Grid Engine.  Toil is also compatible with
+ the Common Workflow Language (CWL) via the "toil-cwl-runner" interface, which
+ this package make available via the Debian alternativess system under the
+ alias "cwl-runner".
 
 #Package: python-toil-doc
 #Architecture: all


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,5 @@ debianize_docs
 spelling
 adjust_to_newer_cwltool
 fix_tests
+soften-pytest-depends
+soften-mesos-deps


=====================================
debian/patches/soften-mesos-deps
=====================================
@@ -0,0 +1,15 @@
+Author: Michael R. Crusoe <michael.crusoe at gmail.com>
+Subject: Use Debian's newer python3-psutil
+--- toil.orig/setup.py
++++ toil/setup.py
+@@ -24,8 +24,8 @@
+     boto3 = 'boto3>=1.7.50, <2.0'
+     futures = 'futures==3.1.1'
+     pycryptodome = 'pycryptodome==3.5.1'
+-    psutil = 'psutil==3.0.1'
+-    protobuf = 'protobuf==3.5.1'
++    psutil = 'psutil>=3.0.1'
++    protobuf = 'protobuf>=3.5.1'
+     azureCosmosdbTable = 'azure-cosmosdb-table==0.37.1'
+     azureAnsible = 'ansible[azure]==2.5.0a1'
+     azureStorage = 'azure-storage==0.35.1'


=====================================
debian/patches/soften-pytest-depends
=====================================
@@ -0,0 +1,24 @@
+Author: Michael R. Crusoe <michael.crusoe at gmail.com>
+Description: No need to depend on testing libraries
+--- toil.orig/setup.py
++++ toil/setup.py
+@@ -45,8 +45,6 @@
+     docker = 'docker==2.5.1'
+     subprocess32 = 'subprocess32<=3.5.2'
+     dateutil = 'python-dateutil'
+-    pytest = 'pytest==3.7.4'
+-    pytest_cov = 'pytest-cov==2.5.1'
+ 
+     core_reqs = [
+         dill,
+@@ -56,9 +54,7 @@
+         docker,
+         dateutil,
+         psutil,
+-        subprocess32,
+-        pytest,
+-        pytest_cov]
++        subprocess32]
+ 
+     mesos_reqs = [
+         psutil,


=====================================
debian/rules
=====================================
@@ -18,6 +18,8 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 	find $(CURDIR)/debian -name cwltoil -delete
+	# remove the below once mesos is packaged and tested
+	find $(CURDIR)/debian -name _toil_mesos_executor -delete
 
 # more py3 test fixes need to be cherry-picked from upstream
 # override_dh_auto_test:



View it on GitLab: https://salsa.debian.org/med-team/toil/compare/380667a975bdc247cfd5c10ed600717052885e81...4028fdb2d11226d478e7296db766d4bdf8e815c0

-- 
View it on GitLab: https://salsa.debian.org/med-team/toil/compare/380667a975bdc247cfd5c10ed600717052885e81...4028fdb2d11226d478e7296db766d4bdf8e815c0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190114/1cf2b1ff/attachment-0001.html>