[med-svn] [Git][med-team/toil][master] debian/patches/test_with_less_memory: reduce default resource reqs for 32bit systems

[Michael R. Crusoe]

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


Commits:
d25e0f36 by Michael R. Crusoe at 2021-02-10T11:36:53+01:00
debian/patches/test_with_less_memory: reduce default resource reqs for 32bit systems

- - - - -


5 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/test_with_less_memory
- debian/rules
- debian/tests/run-unit-tests


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+toil (5.2.0-5) unstable; urgency=high
+
+  * debian/patches/test_with_less_memory: reduce default resource reqs
+    for 32bit systems
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Wed, 10 Feb 2021 11:24:49 +0100
+
 toil (5.2.0-4) unstable; urgency=high
 
   * autopkgtests: skip some s3 related tests.


=====================================
debian/patches/series
=====================================
@@ -7,3 +7,4 @@ soften-pydocker-dep
 python3
 proxy
 ship_tests
+test_with_less_memory


=====================================
debian/patches/test_with_less_memory
=====================================
@@ -0,0 +1,30 @@
+Author: Michael R. Crusoe <crusoe at debian.org>
+Description: reduce default resource usage on 32bit systems
+Forwarded: not-needed
+--- toil.orig/src/toil/common.py
++++ toil/src/toil/common.py
+@@ -21,6 +21,7 @@
+ import tempfile
+ import time
+ import uuid
++import platform
+ 
+ from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
+ from typing import Optional, Callable, Any, List
+@@ -96,9 +97,14 @@
+         self.statePollingWait = 1  # Number of seconds to wait before querying job state
+ 
+         # Resource requirements
+-        self.defaultMemory = 2147483648
++        is_64bits = sys.maxsize > 2**32
++        if is_64bits:
++            self.defaultMemory = 2147483648
++            self.defaultDisk = 2147483648
++        else:
++            self.defaultMemory = 1610612736
++            self.defaultDisk = 1610612736
+         self.defaultCores = 1
+-        self.defaultDisk = 2147483648
+         self.readGlobalFileMutableByDefault = False
+         self.defaultPreemptable = False
+         self.maxCores = sys.maxsize


=====================================
debian/rules
=====================================
@@ -23,7 +23,7 @@ override_dh_auto_install:
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	PYBUILD_SYSTEM=custom \
-		PYBUILD_TEST_ARGS='HOME={home_dir} {interpreter} setup.py develop --user && PYTHONPATH={dir}/src:$$PYTHONPATH PATH={home_dir}/.local/bin/:$$PATH TOIL_TEST_QUICK=True TOIL_SKIP_DOCKER=True {interpreter} -m pytest -vv -W ignore --ignore src/toil/test/provisioners/aws/awsProvisionerTest.py --ignore src/toil/test/wdl/toilwdlTest.py --ignore src/toil/test/cwl/cwlTest.py -k "not test_bioconda and not test_run_conformance and not testImportFtpFile and not ToilWdlIntegrationTest and not SortTest" {dir}/src/toil/test' \
+		PYBUILD_TEST_ARGS='HOME={home_dir} {interpreter} setup.py develop --user && PYTHONPATH={dir}/src:$$PYTHONPATH PATH={home_dir}/.local/bin/:$$PATH TOIL_TEST_QUICK=True TOIL_SKIP_DOCKER=True {interpreter} -m pytest -vv -W ignore --ignore src/toil/test/provisioners/aws/awsProvisionerTest.py --ignore src/toil/test/wdl/toilwdlTest.py --ignore src/toil/test/cwl/cwlTest.py -k "not test_bioconda and not test_run_conformance and not testImportFtpFile and not ToilWdlIntegrationTest and not SortTest and not testCwlexample" {dir}/src/toil/test' \
 		dh_auto_test
 endif
 


=====================================
debian/tests/run-unit-tests
=====================================
@@ -10,4 +10,4 @@ export LC_ALL=C.UTF-8
 # 
 # cd "${AUTOPKGTEST_TMP}"
 
-TOIL_TEST_QUICK=True TOIL_SKIP_DOCKER=True python3 -m pytest -vv -W ignore -k "not test_bioconda and not AWSJobStoreTest and not awsjobstoretest and not testCwlexample and not CWLv10Test and not CWLv11Test and not CWLv12Test" --ignore-glob '*cwlTest*' --pyargs toil.test
+TMP=AUTOPKGTEST_TMP TOIL_TEST_QUICK=True TOIL_SKIP_DOCKER=True python3 -m pytest -vv -W ignore -k "not test_bioconda and not AWSJobStoreTest and not awsjobstoretest and not testCwlexample and not CWLv10Test and not CWLv11Test and not CWLv12Test" --ignore-glob '*cwlTest*' --pyargs toil.test



View it on GitLab: https://salsa.debian.org/med-team/toil/-/commit/d25e0f367a8400830377dedebe4ae4fa28e1f75b

-- 
View it on GitLab: https://salsa.debian.org/med-team/toil/-/commit/d25e0f367a8400830377dedebe4ae4fa28e1f75b
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/20210210/7df480dc/attachment-0001.html>