Merge branch 'AutoDeploy' into dev

hitier
2 parents 15bceff0 1877f051
Showing 16 changed files with 35 additions and 52 deletions Show diff stats
DEV.md
README.md
requirements-tests.txt
requirements.txt
resources-tests/amda-irap-omp-eu-ddservice-base-data-omni-hour-omni202107010-nc
resources-tests/amda-irap-omp-eu-ddservice-base-data-tao-mars-dsc-sw-2022-nc
res/apache.conf -> resources/apache.conf
res/crontab_example.txt -> resources/crontab_example.txt
res/distributed_readme.md -> resources/distributed_readme.md
res/dummy.nc -> resources/dummy.nc
res/dummy_jupiter_coordinates.nc -> resources/dummy_jupiter_coordinates.nc
res/dummy_jupiter_coordinates.txt -> resources/dummy_jupiter_coordinates.txt
res/heliopropa.nginx -> resources/heliopropa.nginx
res/heliopropa.service -> resources/heliopropa.service
resources/post-deploy.sh
res/post-receive.git-hook -> resources/post-receive.git-hook
@@ -9,6 +9,9 @@
  
 ## Testing
  
+    # prerequisites
+    pip install -r requirements-tests.txt
+
     # basic
     PYTHONPATH=. pytest
  
@@ -43,7 +43,7 @@ virtualenv
 ### Python venv
  
 ``` bash
-virtualenv venv
+python3 -m venv venv
 source venv/bin/activate
 pip install matplotlib
 pip install numpy==1.8.*
-selenium flask_testing
+selenium
+flask_testing
+pytest
@@ -7,52 +7,13 @@
  
  
 ## MAIN DEPENDENCIES
-
-Flask==0.12
-Jinja2==2.9.5
-Markdown==2.6.8
-MarkupSafe==1.0
-python-slugify==1.2.4
-requests==2.19.1
-
-# Why not pyvo ?
-# For obscure reasons within spacepy, only numpy 1.7 or 1.8 will work
-# and pyvo requires astropy, that requires a more recent numpy.
-#pyvo==0.9.*
-
-
-## FILE FORMATS
-
-# Also available : https://pypi.org/project/pupynere/
-
-PyYAML==3.12
-netCDF4==1.2.7
-h5py==2.8.0
-# spacepy does not like recent numpy versions (1.7 looks ok -- 1.8 works too)
-numpy==1.8.*
-# We only use pycdf from spacepy.
-# Ulterior versions are broken on install. (for python 2.7)
-spacepy==0.1.5
-
-# isoparse needs at least 2.7
-python-dateutil==2.7.*
-
-## SECOND LEVEL DEPS
-# (comment them out if you have compatibility issues)
-
-appdirs==1.4.3
-click==6.7
-dateutils==0.6.6
-itsdangerous==0.24
-mglob==0.4
-pyparsing==2.2.0
-packaging==16.8
-six==1.10.0
-Werkzeug==0.12
-Cython==0.27.1
-
-
-## WEIRD STUFF
-
-# This version number makes pip yell on the prod server (?)
-#pkg-resources==0.0.0
+wheel
+Flask==2.1.2
+python-dotenv==0.20.0
+requests==2.27.1
+numpy==1.22.4
+python-dateutil==2.8.2
+Yaml8==0.1.2
+netCDF4==1.5.8
+unicode-slugify==0.1.5
+gunicorn==20.1.0
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# SCript to run after heliopropa source where updated.
+#
+# Should be execute within root directory of project
+#
+# May be run by the git post-receive hook
+
+
+
+source  ./venv/bin/activate
+pip install -r requirements.txt
+
+# may be more commands to run ...
+# flask db upgrade
+sudo systemctl restart heliopropa
+sudo systemctl restart nginx
@@ -55,7 +55,7 @@ do
 		git checkout ${BRANCH} # set branch if not done yet, sorry guy
 		git pull ${REPOSITORY} ${BRANCH} # get latest modifications, assumes  remote origin previously set
 		exec git update-server-info
-        ##/bin/sh scripts/post-deploy.sh
+        /bin/sh ./post-deploy.sh
         # Alternately, it is possible to just update a git repo
         echo "DONE -+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+"
 	else