From cae9876ebf63f7d7b5b252713e709349caa01f61 Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Thu, 2 May 2024 09:55:01 +0200 Subject: [PATCH] .. --- python/sdist/pyproject.toml | 6 +-- python/sdist/setup.cfg | 88 ------------------------------------- scripts/buildAmici.sh | 2 +- 3 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 python/sdist/setup.cfg diff --git a/python/sdist/pyproject.toml b/python/sdist/pyproject.toml index c41bd6f2f3..d34dfdc064 100644 --- a/python/sdist/pyproject.toml +++ b/python/sdist/pyproject.toml @@ -23,11 +23,7 @@ requires-python = ">=3.10" dependencies = [ "cmake-build-extension==0.5.1", "sympy>=1.9", - "numpy>=1.19.3; python_version=='3.9'", - "numpy>=1.21.4; python_version>='3.10'", - "numpy>=1.23.2; python_version=='3.11'", - "numpy>=1.26.2; python_version=='3.12'", - "numpy; python_version>='3.13'", + "numpy>=2.0.0dev0", "python-libsbml", "pandas>=2.0.2", "pyarrow", diff --git a/python/sdist/setup.cfg b/python/sdist/setup.cfg deleted file mode 100644 index 06b9910e04..0000000000 --- a/python/sdist/setup.cfg +++ /dev/null @@ -1,88 +0,0 @@ -[metadata] -name = amici -description = Advanced multi-language Interface to CVODES and IDAS -version = file: amici/version.txt -license = BSD 3-Clause License -url = https://github.com/AMICI-dev/AMICI -keywords = differential equations, simulation, ode, cvodes, systems biology, sensitivity analysis, sbml, pysb, petab -author = Fabian Froehlich, Jan Hasenauer, Daniel Weindl and Paul Stapor -author_email = fabian_froehlich@hms.harvard.edu -project_urls = - Bug Reports = https://github.com/AMICI-dev/AMICI/issues - Source = https://github.com/AMICI-dev/AMICI - Documentation = https://amici.readthedocs.io/en/latest/ -classifiers = - Development Status :: 5 - Production/Stable - Intended Audience :: Science/Research - License :: OSI Approved :: BSD License - Operating System :: POSIX :: Linux - Operating System :: MacOS :: MacOS X - Programming Language :: Python - Programming Language :: C++ - Topic :: Scientific/Engineering :: Bio-Informatics - -[options] -packages = find_namespace: -package_dir = - amici = amici -python_requires = >=3.10 -install_requires = - cmake-build-extension==0.5.1 - sympy>=1.9 - numpy>=2.0.0dev0 - python-libsbml - pandas>=2.0.2 - pyarrow - wurlitzer - toposort - setuptools>=48 - mpmath -include_package_data = True -zip_safe = False - -[options.extras_require] -# Don't include any URLs here - they are not supported by PyPI: -# HTTPError: 400 Bad Request from https://upload.pypi.org/legacy/ -# Invalid value for requires_dist. Error: Can't have direct dependency: ... -petab = petab>=0.2.9 -pysb = pysb>=1.13.1 -test = - benchmark_models_petab @ git+https://github.com/Benchmarking-Initiative/Benchmark-Models-PEtab.git@master#subdirectory=src/python - h5py - pytest - pytest-cov - pytest-rerunfailures - coverage - shyaml - antimony>=2.13 - # see https://github.com/sys-bio/antimony/issues/92 - # unsupported x86_64 / x86_64h - antimony!=2.14; platform_system=='Darwin' and platform_machine in 'x86_64h' - scipy - pooch -vis = - matplotlib - seaborn -examples = - jupyter - scipy - -[options.package_data] -amici = - amici/include/amici/* - src/*template* - swig/* - libs/* - setup.py.template - -[options.exclude_package_data] -* = - README.txt - - -[options.entry_points] - -; amici_import_petab.py is kept for backwards compatibility -console_scripts = - amici_import_petab = amici.petab.cli.import_petab:_main - amici_import_petab.py = amici.petab.cli.import_petab:_main diff --git a/scripts/buildAmici.sh b/scripts/buildAmici.sh index 80b724c8c3..47b1779757 100755 --- a/scripts/buildAmici.sh +++ b/scripts/buildAmici.sh @@ -46,7 +46,7 @@ fi # set python executable for cmake export PYTHON_EXECUTABLE="${amici_path}/venv/bin/python" -python3 -m pip install numpy +python3 -m pip install -U numpy>=2.0.0dev0 ${cmake} \ -Wdev -DAMICI_CXX_OPTIONS="-Wall;-Wextra${extra_cxx_flags}" \