Merge pull request #530 from kartoza/develop

Version 2.1.0 - Add ehyd harvesters (#529)

deployment/docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.4'
 # Common Django template for Geonode, Celery and Celerycam services below
 x-common-django:
   &default-common-django
-  image: kartoza/igrac_ggis:2.0.0
+  image: kartoza/igrac_ggis:2.1.0
   build:
     context: ../
     dockerfile: deployment/docker/Dockerfile
@@ -47,6 +47,7 @@ x-common-django:
     - STATIC_ROOT=/home/web/static/
     - MEDIA_ROOT=/home/web/media/
     - GWML_FOLDER=/home/web/gwml2-file/
+    - SFTP_FOLDER=/home/web/sftp/
     - FILE_UPLOAD_TEMP_DIR=/home/web/temp/
     - STATIC_URL=/static/
     - MEDIA_URL=/uploaded/
@@ -62,6 +63,7 @@ x-common-django:
     - ./volumes/media:/home/web/media:rw
     - ./volumes/temp:/home/web/temp:rw
     - ./volumes/gwml2-file:/home/web/gwml2-file:rw
+    - ./volumes/sftp:/home/web/sftp:rw
   restart: on-failure
 
 services:

deployment/docker/REQUIREMENTS.txt

@@ -13,10 +13,10 @@ service_identity
 
 # igrac
 wagtail==2.9.3
-wagtailmenus
+wagtailmenus==3.1.3
 openpyxl==3.0.5
-pyexcel-xls
-pyexcel-xlsx
+pyexcel-xls==0.7.0
+pyexcel-xlsx==0.6.0
 
 git+https://github.com/kartoza/[email protected]
 # git+https://github.com/kartoza/django-mapstore-adapter.git@geonode_latest

django_project/core/settings/base.py

@@ -166,4 +166,8 @@
     CELERY_BEAT_SCHEDULE['run_all_harvester'] = {
         'task': 'gwml2.tasks.harvester.run_all_harvester',
         'schedule': crontab(minute=0, hour=00, day_of_week=[0, 3]),
-    }
+    }
+    CELERY_BEAT_SCHEDULE['clean_download_file'] = {
+        'task': 'gwml2.tasks.clean.clean_download_file',
+        'schedule': crontab(hour=0),
+    }

django_project/version/version.txt

@@ -1 +1 @@
-2.0.0
+2.1.0