From c70d65b9880f8e1f3934278aee7a542e8d5f39a1 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Thu, 26 Sep 2019 12:37:39 +0000 Subject: [PATCH] Add package: urh (WIP) --- server/pypi/packages/urh/meta.yaml | 10 +++++ .../pypi/packages/urh/patches/chaquopy.patch | 43 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 server/pypi/packages/urh/meta.yaml create mode 100644 server/pypi/packages/urh/patches/chaquopy.patch diff --git a/server/pypi/packages/urh/meta.yaml b/server/pypi/packages/urh/meta.yaml new file mode 100644 index 0000000000..82f36a3f4e --- /dev/null +++ b/server/pypi/packages/urh/meta.yaml @@ -0,0 +1,10 @@ +package: + name: urh + version: 2.7.5 + +build: + number: 3 + +requirements: + host: + - numpy 1.14.2 diff --git a/server/pypi/packages/urh/patches/chaquopy.patch b/server/pypi/packages/urh/patches/chaquopy.patch new file mode 100644 index 0000000000..48768d667c --- /dev/null +++ b/server/pypi/packages/urh/patches/chaquopy.patch @@ -0,0 +1,43 @@ +diff -ur src-original/setup.py src/setup.py +--- src-original/setup.py 2019-08-25 09:40:56.000000000 +0000 ++++ src/setup.py 2019-09-21 11:50:42.720322362 +0000 +@@ -56,10 +56,9 @@ + def finalize_options(self): + print("Finalizing options") + _build_ext.finalize_options(self) +- # Prevent numpy from thinking it is still in its setup process: +- __builtins__.__NUMPY_SETUP__ = False +- import numpy +- self.include_dirs.append(numpy.get_include()) ++ # Chaquopy ++ self.include_dirs.append(os.path.abspath("../requirements/numpy/core/include")) ++ + + + def get_packages(): +@@ -113,14 +112,14 @@ + except: + return "" + +-install_requires = ["numpy", "psutil", "pyzmq", "cython"] ++install_requires = ["numpy", "psutil", "pyzmq"] # Chaquopy: removed cython + if IS_RELEASE: + install_requires.append("pyqt5") + else: + try: + import PyQt5 + except ImportError: +- install_requires.append("pyqt5") ++ pass # Chaquopy: removed install_requires.append("pyqt5") + + if sys.version_info < (3, 4): + install_requires.append('enum34') +@@ -140,7 +139,7 @@ + license="GNU General Public License (GPL)", + download_url="https://github.com/jopohl/urh/tarball/v" + str(version.VERSION), + install_requires=install_requires, +- setup_requires=['numpy'], ++ # Chaquopy: removed setup_requires=['numpy'], + packages=get_packages(), + ext_modules=get_extensions(), + cmdclass={'build_ext': build_ext},