aligning local dev

climateintelligence · Mar 7, 2024 · b4c12e4 · b4c12e4
1 parent 06c5070
commit b4c12e4
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 5 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/docs/.DS_Store b/docs/.DS_Store
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -87,7 +87,7 @@
     "proj",
     "cartopy",
     "scikit-learn",
-    "cairo"#,
+    "cairo",
     #"ipykernel",
     #"tensorflow"
 ]
@@ -122,9 +122,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = "0.1.0"
+version = "0.1.1"
 # The full version, including alpha/beta/rc tags.
-release = "0.1.0"
+release = "0.1.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/environment.yml b/environment.yml
@@ -18,6 +18,7 @@ dependencies:
 - scipy
 - birdy
 - tensorflow
+- numpy=1.26.0
 # tests
 - pytest
 - pandoc
diff --git a/requirements.txt b/requirements.txt
@@ -10,4 +10,5 @@ aiohttp
 birdy
 tensorflow
 scipy
-ipykernel
+ipykernel
+numpy
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -14,3 +14,8 @@ bump2version
 Click
 cruft
 # Changing dependencies above this comment will create merge conflicts when updating the cookiecutter template with cruft. Add extra requirements below this line.
+birdy
+tensorflow
+scipy
+ipykernel
+numpy
diff --git a/shearwater/.DS_Store b/shearwater/.DS_Store
diff --git a/shearwater/processes/wps_cyclone.py b/shearwater/processes/wps_cyclone.py
@@ -99,7 +99,7 @@ def _handler(request, response):
         end_date = request.inputs['end_day'][0].data
         # area = request.inputs['area'][0].data
 
-        data1 = pd.read_csv("/home/b/b382633/shearwater/data/test_dailymeans_Sindian_1.csv")
+        data1 = pd.read_csv("/home/b/b382633/shearwater/data/test_dailymeans_Sindian_1.csv") # to be updated with data repository
         data2 = pd.read_csv("/home/b/b382633/shearwater/data/test_dailymeans_Sindian_2.csv")
         data = pd.concat((data1, data2), ignore_index=True)
         data = data.loc[(data.time >= start_date) & (data.time <= end_date)]
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ dependencies: @@
     - scipy
     - birdy
     - tensorflow
+    - numpy=1.26.0
     # tests
     - pytest
     - pandoc