summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/grocsvs-dont-use-admiral.patch
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2022-02-06 23:18:52 -0500
committerLeo Famulari <leo@famulari.name>2022-02-16 11:57:14 -0500
commitd2bb4847b96e51b71126778bb16daa7674a6690c (patch)
tree30b42d5f903857a55e30fb1756a52c0f475ebc60 /gnu/packages/patches/grocsvs-dont-use-admiral.patch
parent5fffd8352b97295303c4782a5835566338119382 (diff)
downloadguix-patches-d2bb4847b96e51b71126778bb16daa7674a6690c.tar
guix-patches-d2bb4847b96e51b71126778bb16daa7674a6690c.tar.gz
gnu: Remove leftover patch files.base-for-series-11411base-for-series-11410
These patches aren't used anywhere in Guix and we forgot to remove them. * gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch, gnu/packages/patches/ghc-monad-par-fix-tests.patch, gnu/packages/patches/glibc-CVE-2018-11236.patch, gnu/packages/patches/glibc-CVE-2018-11237.patch, gnu/packages/patches/glibc-hurd-magic-pid.patch, gnu/packages/patches/grocsvs-dont-use-admiral.patch, gnu/packages/patches/hydra-disable-darcs-test.patch, gnu/packages/patches/inkscape-poppler-0.76.patch, gnu/packages/patches/libvirt-create-machine-cgroup.patch, gnu/packages/patches/linux-libre-arm64-generic-pinebook-lcd.patch, gnu/packages/patches/marble-qt-add-qt-headers.patch, gnu/packages/patches/maven-enforcer-api-fix-old-dependencies.patch, gnu/packages/patches/mescc-tools-boot.patch, gnu/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch, gnu/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch, gnu/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch, gnu/packages/patches/ocaml-Add-a-.file-directive.patch, gnu/packages/patches/ocaml-CVE-2015-8869.patch, gnu/packages/patches/ocaml-bitstring-fix-configure.patch, gnu/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch, gnu/packages/patches/openbabel-fix-crash-on-nwchem-output.patch, gnu/packages/patches/openjdk-14-builtins.patch, gnu/packages/patches/openssl-c-rehash-in.patch, gnu/packages/patches/openssl-runpath.patch, gnu/packages/patches/passwordsafe-meson-remove-extra-argument.patch, gnu/packages/patches/patchutils-test-perms.patch, gnu/packages/patches/python-CVE-2018-14647.patch, gnu/packages/patches/python-CVE-2020-26116.patch, gnu/packages/patches/python-axolotl-AES-fix.patch, gnu/packages/patches/python-babel-fix-parse-future-test.patch, gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch, gnu/packages/patches/python-pytest-asyncio-python-3.8.patch, gnu/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch, gnu/packages/patches/qt4-ldflags.patch, gnu/packages/patches/rust-coresimd-doctest.patch, gnu/packages/patches/streamlink-update-test.patch, gnu/packages/patches/tcc-boot-0.9.27.patch, gnu/packages/patches/vtk-8-fix-freetypetools-build-failure.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches/grocsvs-dont-use-admiral.patch')
-rw-r--r--gnu/packages/patches/grocsvs-dont-use-admiral.patch69
1 files changed, 0 insertions, 69 deletions
diff --git a/gnu/packages/patches/grocsvs-dont-use-admiral.patch b/gnu/packages/patches/grocsvs-dont-use-admiral.patch
deleted file mode 100644
index cb976e19b0..0000000000
--- a/gnu/packages/patches/grocsvs-dont-use-admiral.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-python-admiral doesn't have a license
-https://github.com/nspies/admiral/issues/3
-
-diff --git a/setup.py b/setup.py
-index 692b6a0..568f381 100755
---- a/setup.py
-+++ b/setup.py
-@@ -20,7 +20,7 @@ setup(
- 'console_scripts' : ["grocsvs = grocsvs.main:main"]
- },
-
-- install_requires = ["admiral", "h5py", "networkx>=2.0", "pandas", "pybedtools",
-+ install_requires = ["h5py", "networkx>=2.0", "pandas", "pybedtools",
- "pyfaidx", "pysam>=0.10.0", "scipy", "ipython-cluster-helper",
- "pygraphviz", "psutil"],
-
-diff --git a/src/grocsvs/jobmanagers.py b/src/grocsvs/jobmanagers.py
-index 6da0b58..112d7ff 100755
---- a/src/grocsvs/jobmanagers.py
-+++ b/src/grocsvs/jobmanagers.py
-@@ -41,34 +41,3 @@ class MultiprocessingCluster(Cluster):
- pool = multiprocessing.Pool(processes=self.processes)
- return pool.map_async(fn, args).get(999999)
-
--
--class AdmiralCluster(Cluster):
-- def map(self, fn, args):
-- from admiral import jobmanagers, remote
--
-- cluster_options = self.cluster_settings.cluster_options.copy()
--
-- scheduler = cluster_options.pop("scheduler")
--
-- jobmanager_class = jobmanagers.get_jobmanager(scheduler)
-- jobmanager = jobmanager_class(
-- batch_dir=self.batch_dir, log_dir=self.batch_dir)
--
--
-- if not "mem" in cluster_options:
-- cluster_options["mem"] = "16g"
-- if not "time" in cluster_options:
-- cluster_options["time"] = "12h"
--
-- jobs = []
-- #for i, arg in enumerate(args):
--
-- job_name = args[0].__class__.__name__
-- args = [[arg] for arg in args]
-- job = remote.run_remote(fn, jobmanager, job_name, args=args,
-- array=True, overwrite=True, **cluster_options)
--
-- result = jobmanagers.wait_for_jobs([job], wait=5, progress=True)
--
-- if not result:
-- raise Exception("Some chunks failed to complete")
-diff --git a/src/grocsvs/pipeline.py b/src/grocsvs/pipeline.py
-index ab1bb2d..350976f 100755
---- a/src/grocsvs/pipeline.py
-+++ b/src/grocsvs/pipeline.py
-@@ -8,8 +8,7 @@ from grocsvs import utilities
- def make_jobmanager(jobmanager_settings, processes, batch_dir):
- jobmanager_classes = {"IPCluster":jobmanagers.IPCluster,
- "local": jobmanagers.LocalCluster,
-- "multiprocessing": jobmanagers.MultiprocessingCluster,
-- "admiral": jobmanagers.AdmiralCluster}
-+ "multiprocessing": jobmanagers.MultiprocessingCluster}
-
- cls = jobmanager_classes[jobmanager_settings.cluster_type]
- return cls(processes, jobmanager_settings, batch_dir)