From f68e33cff0f4fd7c948cce4349fe6e59447e9874 Mon Sep 17 00:00:00 2001 From: Stephen Roberts Date: Tue, 8 Nov 2022 20:27:18 +1030 Subject: [PATCH] clean up auxilary files --- pyproject.toml | 2 +- requirements.txt | 55 ++++++------------- setup.py | 1 + .../dam_break_dry/numerical_dam_break_dry.py | 2 +- .../dam_break_wet/numerical_dam_break_wet.py | 2 +- 5 files changed, 22 insertions(+), 40 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 80f48b102..e85ddf992 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools <= 60", "future", "Cython", "wheel", "numpy", "gitpython", "dill"] +requires = ["setuptools <= 60", "Cython", "wheel", "numpy", "gitpython", "dill"] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index 5061d2e56..8c61a5d7c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,41 +1,22 @@ - # Requirements to install anuga in read the docs -# setuptools -# wheel -# pytest -# numpy -# scipy -# netcdf4 -# matplotlib -# dill -# cython -# future -# Pmw -# meshpy -# pymetis -# gitpython -# pytz -# utm -# nbsphinx - -cython >= 0.29 +cython pybind11 -dill >= 0.3 -future >= 0.18 -gitpython >= 3.1 -matplotlib >= 3.5 -meshpy >= 2020.1 -nbsphinx >= 0.8 -netcdf4 >= 1.5 -numpy >= 1.21 -Pmw >= 2.0.1 -pymetis >= 2020.1 -pytest >= 7.1.2 -pytz >= 2022.1 -scipy >= 1.7 -setuptools >= 62.3 -sphinx >= 5.0.1 -utm >= 0.7.0 -wheel >= 0.37 +dill +future +gitpython +matplotlib +meshpy +nbsphinx +netcdf4 +numpy +Pmw +pymetis +pytest +pytz +scipy +setuptools +sphinx +utm +wheel diff --git a/setup.py b/setup.py index 7d13e4773..ab7854348 100644 --- a/setup.py +++ b/setup.py @@ -139,6 +139,7 @@ def setup_package(): 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ], cmdclass={'clean': CleanCommand}, **extra_setuptools_args) diff --git a/validation_tests/analytical_exact/dam_break_dry/numerical_dam_break_dry.py b/validation_tests/analytical_exact/dam_break_dry/numerical_dam_break_dry.py index f86028be7..2fe18da08 100644 --- a/validation_tests/analytical_exact/dam_break_dry/numerical_dam_break_dry.py +++ b/validation_tests/analytical_exact/dam_break_dry/numerical_dam_break_dry.py @@ -7,7 +7,7 @@ #------------------------------------------------------------------------------ import anuga from anuga import Domain as Domain -from numpy import zeros, float +from numpy import zeros from anuga import myid, finalize, distribute diff --git a/validation_tests/analytical_exact/dam_break_wet/numerical_dam_break_wet.py b/validation_tests/analytical_exact/dam_break_wet/numerical_dam_break_wet.py index eabad68d2..fe069bfb9 100644 --- a/validation_tests/analytical_exact/dam_break_wet/numerical_dam_break_wet.py +++ b/validation_tests/analytical_exact/dam_break_wet/numerical_dam_break_wet.py @@ -13,7 +13,7 @@ from anuga import myid, finalize, distribute from math import cos -from numpy import zeros, float +from numpy import zeros from time import localtime, strftime, gmtime