pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-macs2: Fix 2.2.9.1 build, using legacy cython



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Nov 17 07:35:08 2023 -0600
Changeset:	3538a9a9a0439380c1a53e4a732b8cbafe6d4999

Modified Files:
	py-macs2/Makefile
	py-macs2/distinfo
Removed Files:
	py-macs2/patches/patch-setup.py

Log Message:
py-macs2: Fix 2.2.9.1 build, using legacy cython

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3538a9a9a0439380c1a53e4a732b8cbafe6d4999

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-macs2/Makefile               |  2 +-
 py-macs2/distinfo               |  1 -
 py-macs2/patches/patch-setup.py | 29 -----------------------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diffs:
diff --git a/py-macs2/Makefile b/py-macs2/Makefile
index a6dc198fa3..5955b57361 100644
--- a/py-macs2/Makefile
+++ b/py-macs2/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/macs3-project/MACS
 COMMENT=	Algorithm for identifying transcription factor binding sites
 LICENSE=	modified-bsd
 
-TOOL_DEPENDS+=	${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
+TOOL_DEPENDS+=	${PYPKGPREFIX}-cython-0.*:../../wip/py-cython-legacy
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27 38
 
diff --git a/py-macs2/distinfo b/py-macs2/distinfo
index 3dcb2030d5..df4d78b548 100644
--- a/py-macs2/distinfo
+++ b/py-macs2/distinfo
@@ -3,4 +3,3 @@ $NetBSD$
 BLAKE2s (MACS2-2.2.9.1.tar.gz) = a4563cb4e23096b972941c55eb416ec7db9b05b207c82747dee31657c00d79c3
 SHA512 (MACS2-2.2.9.1.tar.gz) = 6d001d95bac6b6c8ac99592a9345a6ac6836eeb61ff522129c9660ac9bf42bf293af56bd84824b721793a0ec2c73d0a062adb171e5a5a033045aa7552fa28e8b
 Size (MACS2-2.2.9.1.tar.gz) = 133109075 bytes
-SHA1 (patch-setup.py) = c35f9e13e2ec3b6d0381271128cf3426567a74d5
diff --git a/py-macs2/patches/patch-setup.py b/py-macs2/patches/patch-setup.py
deleted file mode 100644
index 395ad3989e..0000000000
--- a/py-macs2/patches/patch-setup.py
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-# Unbundle numpy
-
---- setup.py.orig	2023-05-18 12:06:38.965674517 +0000
-+++ setup.py
-@@ -25,22 +25,6 @@ def main():
-         sys.exit(1)
-     cwd = os.path.abspath(os.path.dirname(__file__))
- 
--    # install required numpy
--    p = subprocess.call([sys.executable, "-m", 'pip', 'install', f'numpy{numpy_requires}'],cwd=cwd)
--    if p != 0:
--        # Could be due to a too old pip version and build isolation, check that
--        try:
--            # Note, pip may not be installed or not have been used
--            import pip
--            if LooseVersion(pip.__version__) < LooseVersion('18.0.0'):
--                raise RuntimeError("Installing requirements failed. Possibly due "
--                                   "to `pip` being too old, found version {}, "
--                                   "needed is >= 18.0.0.".format(pip.__version__))
--            else:
--                raise RuntimeError("Installing requirements failed!")
--        except ImportError:
--            raise RuntimeError("Installing requirement failed! `pip` has to be installed!")
--        
-     from numpy import get_include as numpy_get_include
-     numpy_include_dir = [numpy_get_include()]
-         


Home | Main Index | Thread Index | Old Index