Merge pull request #30 from nens/eli-rename-package-internally

rename internal package, add missing dependencies
nens · Sep 10, 2024 · b1abe57 · b1abe57
2 parents f6f04f2 + 336dad8
commit b1abe57
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,5 +1,5 @@
 [run]
-source = batch_calculator
+source = threedi_urban_eia_nl
 
 [report]
 show_missing = true

diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 *.swp
 *.pyc
 
-batch_calculator/huidig
+threedi_urban_eia_nl/huidig
 # Packages/buildout/pip/pipenv
 *.egg
 *.egg-info

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,7 @@
 # Include docs in the root.
 include *.rst
 # Include everything in our project directory.
-graft batch_calculator
+graft threedi_urban_eia_nl
 # Exclude byte-compiled code
 global-exclude __pycache__
 global-exclude *.py[co]
diff --git a/README.rst b/README.rst
@@ -46,7 +46,7 @@ Created Files and Directories
 
 - aggregation_netcdf, directory containing simulation aggregate result data
 - simulations, directory containing simulation log data (use --debug option)
-- batch_calculator_statistics.csv, batch calculation result
+- threedi_urban_eia_nl_statistics.csv, batch calculation result
 - crashed_simulations.json, IDs of crashed simulations (optional)
 - created_simulations_<date>.json, information about created simulations, serves as input file for process-rain-series-results
 - gridadmin.h5, necessary for calculation of batch statistics

diff --git a/pyproject.toml b/pyproject.toml
@@ -19,21 +19,23 @@ dependencies = [
     "pandas",
     "threedi-api-client>=4.0.0",
     "threedigrid>=1.0.16",
+    "numpy<2",
+    "SQLAlchemy",
 ]
 
 [project.scripts]
-process-rain-series-results = "batch_calculator.process_results:process_results"
-run-rain-series-simulations = "batch_calculator.rain_series_simulations:create_rain_series_simulations"
+process-rain-series-results = "threedi_urban_eia_nl.process_results:process_results"
+run-rain-series-simulations = "threedi_urban_eia_nl.rain_series_simulations:create_rain_series_simulations"
 
 [project.urls]
 Repository = "https://github.com/nens/threedi-urban-eia-nl"
 Changelog = "https://github.com/nens/threedi-urban-eia-nl/blob/master/CHANGES.rst"
 
 [tool.setuptools]
-packages = ["batch_calculator"]
+packages = ["threedi_urban_eia_nl"]
 
 [tool.setuptools.dynamic]
-version = {attr = "batch_calculator.__version__"}
+version = {attr = "threedi_urban_eia_nl.__version__"}
 
 [tool.zest-releaser]
 release = false

diff --git a/batch_calculator/__init__.py → threedi_urban_eia_nl/__init__.py b/batch_calculator/__init__.py → threedi_urban_eia_nl/__init__.py
diff --git a/batch_calculator/process_results.py → threedi_urban_eia_nl/process_results.py b/batch_calculator/process_results.py → threedi_urban_eia_nl/process_results.py
@@ -14,7 +14,7 @@
 from threedi_api_client.versions import V3BetaApi
 from threedigrid.admin.gridresultadmin import GridH5AggregateResultAdmin
 
-from batch_calculator.rain_series_simulations import api_call, printProgressBar
+from threedi_urban_eia_nl.rain_series_simulations import api_call, printProgressBar
 
 
 def repetition_time_volumes(weir_results, n, stats=[1, 2, 5, 10]):

diff --git a/batch_calculator/rain_series_simulations.py → ...i_urban_eia_nl/rain_series_simulations.py b/batch_calculator/rain_series_simulations.py → ...i_urban_eia_nl/rain_series_simulations.py