Adding new dependencies to setup scripts

GeoscienceAustralia · Jan 7, 2025 · 5765a7b · 5765a7b
1 parent f222013
commit 5765a7b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/seismic/ASDFdatabase/analytics/station_analytics.py b/seismic/ASDFdatabase/analytics/station_analytics.py
@@ -144,7 +144,7 @@ def analyse_data(self,
         if(self.progress_tracker): self.progress_tracker.initialize(len(self.st_list))
 
         # launch parallel computations
-        if (0):
+        if (1):
             p = Pool(ncpus=self.nproc)
             p.map(partial(self._generate_psds, network, station, location, channel, sampling_rate),
                   proc_st_list, proc_et_list)

diff --git a/setup_scripts/conda_env_linux.sh b/setup_scripts/conda_env_linux.sh
@@ -70,6 +70,7 @@ pip3 install rasterio==1.2.10
 pip3 install notebook==6.4.10
 pip3 install ipython==7.10.0
 pip3 install jedi==0.17
+pip3 install multiprocess==0.70.12.2
 pip3 install pathos==0.2.8
 
 echo "#######################################################################"

diff --git a/setup_scripts/conda_env_osx.sh b/setup_scripts/conda_env_osx.sh
@@ -25,7 +25,7 @@ conda activate $1
 echo "==== Installing packages not available through conda ===="
 pip3 install pip==21.1.2
 pip3 install obspy==1.2.2
-pip3 install click==7.1.2 pyasdf==0.5.1 obspyh5==0.5.0 ordered_set ujson psutil PyPDF2==1.26.0 sortedcontainers stockwell==1.0.7 pillow==8.4.0 ipython==7.10.1 basemap==1.3.2 descartes==1.1.0 PyYAML==6.0 opencv-python==4.5.3.56 pathos==0.2.8
+pip3 install click==7.1.2 pyasdf==0.5.1 obspyh5==0.5.0 ordered_set ujson psutil PyPDF2==1.26.0 sortedcontainers stockwell==1.0.7 pillow==8.4.0 ipython==7.10.1 basemap==1.3.2 descartes==1.1.0 PyYAML==6.0 opencv-python==4.5.3.56 multiprocess==0.70.12.2 pathos==0.2.8
 
 echo "==== Installing a whittled down version of the rf package ===="
 

diff --git a/setup_scripts/conda_env_windows.sh b/setup_scripts/conda_env_windows.sh
@@ -25,7 +25,7 @@ conda activate $1
 echo "==== Installing packages not available through conda ===="
 pip3 install pip==21.1.2
 pip3 install obspy==1.2.2
-pip3 install click==7.1.2 pyasdf==0.5.1 obspyh5==0.5.0 ordered_set ujson psutil PyPDF2==1.26.0 sortedcontainers stockwell==1.0.7 pillow==8.4.0 ipython==7.10.1 basemap==1.3.0 descartes==1.1.0 PyYAML pathos==0.2.8
+pip3 install click==7.1.2 pyasdf==0.5.1 obspyh5==0.5.0 ordered_set ujson psutil PyPDF2==1.26.0 sortedcontainers stockwell==1.0.7 pillow==8.4.0 ipython==7.10.1 basemap==1.3.0 descartes==1.1.0 PyYAML multiprocess==0.70.12.2 pathos==0.2.8
 
 echo "==== Installing a whittled down version of the rf package ===="