From 44579e3870825fa8f1694d079f470a95cb1c1d54 Mon Sep 17 00:00:00 2001
From: Peter Steinbach
Date: Mon, 6 Feb 2023 12:15:14 +0100
Subject: [PATCH] fix numpy version for deprecation of np.float, np.int,
np.bool etc
Signed-off-by: Peter Steinbach
---
requirements.txt | 2 +-
setup.py | 46 +++++++++++++++++++++++-----------------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 908aeb1..bf29f6f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
torch>=1.1
-numpy
+numpy<1.24
scipy
sympy
pymanopt
diff --git a/setup.py b/setup.py
index 61732cf..3da8ce8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,48 +1,48 @@
-
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
about = {}
with open("e2cnn/__about__.py") as fp:
exec(fp.read(), about)
install_requires = [
- 'torch',
- 'numpy',
- 'scipy',
- 'sympy',
+ "torch",
+ "numpy<1.24",
+ "scipy",
+ "sympy",
]
setup_requires = []
-tests_require = ['scikit-learn', 'scikit-image']
+tests_require = ["scikit-learn", "scikit-image"]
extras_require = {
# 'RBF-FD and Gaussians': ['cython', 'RBF @ git+https://github.com/treverhines/RBF']
}
-with open("README.md", 'r', encoding='utf-8') as f:
+with open("README.md", "r", encoding="utf-8") as f:
long_description = f.read()
-download_url = 'https://github.com/QUVA-Lab/e2cnn/archive/v{}.tar.gz'.format(about['__version__'])
+download_url = "https://github.com/QUVA-Lab/e2cnn/archive/v{}.tar.gz".format(
+ about["__version__"]
+)
setup(
- name=about['__title__'],
- version=about['__version__'],
- description=about['__summary__'],
- author=about['__author__'],
- author_email=about['__email__'],
- url=about['__url__'],
+ name=about["__title__"],
+ version=about["__version__"],
+ description=about["__summary__"],
+ author=about["__author__"],
+ author_email=about["__email__"],
+ url=about["__url__"],
download_url=download_url,
- license=about['__license__'],
+ license=about["__license__"],
long_description=long_description,
long_description_content_type="text/markdown",
- packages=find_packages(exclude=['test', 'test.*']),
- python_requires='>=3.7',
+ packages=find_packages(exclude=["test", "test.*"]),
+ python_requires=">=3.7",
keywords=[
- 'pytorch',
- 'cnn',
- 'convolutional-networks'
- 'equivariant',
- 'isometries',
+ "pytorch",
+ "cnn",
+ "convolutional-networks" "equivariant",
+ "isometries",
],
install_requires=install_requires,
setup_requires=setup_requires,