Merge branch 'localdev' into 'next'

switch to miniconda image

See merge request !12

.env

@@ -8,4 +8,4 @@ DJANGO_SUPERUSER_PASSWORD=webreflect
 DJANGO_SUPERUSER_EMAIL=webreflect@localhost
 APP_SECRET='y&#94bnh&4zw3s)0h2&f$ve87_1c_t*+hxfl=2v9429^75-t03'
 SETTINGS_DIR=/var/www/web_reflectivity/app/web_reflectivity
-C_FORCE_ROOT=true
\ No newline at end of file
+C_FORCE_ROOT=true

docker-compose.yml

-#use for local developoment 
+#use for local development
 
 version: '3'
 

src/docker-entrypoint.sh

@@ -10,7 +10,7 @@ done
 # collect static files
 python3 manage.py collectstatic --noinput
 
-# migrate djano models
+# migrate django models
 python3 manage.py flush --no-input
 python3 manage.py makemigrations --noinput
 python3 manage.py migrate --noinput
@@ -19,4 +19,4 @@ python3 manage.py migrate --noinput
 python3 manage.py createsuperuser --noinput
 
 # run application
-/usr/local/bin/gunicorn web_reflectivity.wsgi:application -w 2 -b :8000 --reload
+gunicorn web_reflectivity.wsgi:application -w 2 -b :8000 --reload

src/environment.yml

@@ -17,15 +17,13 @@ dependencies:
   - redis
   - redis-py
   - celery
-  - django
+  - django=3.2
   - django-celery-results
   - refl1d
-  - python-ldap
-  - psycopg2
-  - sphinx
-  - flake8
+  - python-ldap>=3.1
+  - psycopg2-binary=2.8.6
+  - gunicorn
   - pip:
     - channels_redis
-    - django-auth-ldap
-    - git+https://github.com/ornl-ndav/django-remote-submission.git@v2.1.1#egg=django-remote-submission-2.1.1
-    - sphinx-rtd-theme
+    - django-auth-ldap==4.0.0
+    - git+https://github.com/ornl-ndav/django-remote-submission.git

src/requirements.txt

@@ -15,4 +15,3 @@ channels_redis
 gunicorn
 psycopg2-binary>=2.8
 django_auth_ldap
-