diff --git a/.dockerignore b/.dockerignore index 8bb6a6a4..6e5eccd6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,5 @@ venv +tmp **/*/node_modules +pygeppetto-django +static diff --git a/requirements.in b/requirements.in index 06e9a912..87a504d5 100644 --- a/requirements.in +++ b/requirements.in @@ -1,22 +1,26 @@ -django==1.11.23 -psycopg2==2.7.7 -channels==2.1.2 +django==1.11.29 +psycopg2-binary==2.8.6 +channels==2.3.1 djangorestframework==3.7.1 drf-writable-nested django-filter==1.1.0 +django-timezone-field==3.1 # djangorestframework-jwt -django-extensions +django-extensions==2.1.6 django-dotenv rest-framework-cache django-material -celery[redis] -django-celery-beat -django-celery-results +celery[redis]==4.2.2 +django-celery-beat==1.4.0 +django-celery-results==1.0.4 django-db-logger -git+git://github.com/scidash/neuronunit@metacell#egg=neuronunit -git+git://github.com/MetaCell/scidash-api.git@master#egg=scidash_api -wheel==0.33.6 -sentry-sdk==1.0.0 +neo==0.5.2 +pynn==0.9.5 +Jinja2==2.11.3 +git+git://github.com/scidash/neuronunit@metacell +git+git://github.com/MetaCell/scidash-api.git@master +wheel +sentry-sdk django-ckeditor==5.9.0 django-admin-sortable2==0.7.5 -# social-auth-app-django==4.0.0 # will be installed through install script install-backend +social-auth-app-django==4.0.0 # will be installed through install script install-backend diff --git a/requirements.txt b/requirements.txt index 14745d2e..87a504d5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,112 +1,26 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile requirements.in -# -amqp==2.4.2 # via kombu -asgiref==2.3.2 # via channels -async-timeout==3.0.1 # via asgiref -attrs==19.1.0 # via automat, twisted -autobahn==19.3.3 # via daphne -automat==0.7.0 # via twisted -billiard==3.5.0.5 # via celery +django==1.11.29 +psycopg2-binary==2.8.6 +channels==2.3.1 +djangorestframework==3.7.1 +drf-writable-nested +django-filter==1.1.0 +django-timezone-field==3.1 +# djangorestframework-jwt +django-extensions==2.1.6 +django-dotenv +rest-framework-cache +django-material celery[redis]==4.2.2 -channels==2.1.2 -constantly==15.1.0 # via twisted -daphne==2.2.5 # via channels -dask[complete]==2.9.0 # via distributed -deap==1.3.0 -decorator==4.4.1 # via ipyparallel, ipython, networkx, traitlets, validators -defusedxml==0.6.0 # via nbconvert -distributed==2.9.0 # via dask -django-admin-sortable2==0.7.5 django-celery-beat==1.4.0 django-celery-results==1.0.4 -django-ckeditor==5.9.0 -django-db-logger==0.1.7 -django-dotenv==1.4.2 -django-extensions==2.1.6 -django-filter==1.1.0 -django-material==1.5.2 -django-timezone-field==3.0 # via django-celery-beat -django==1.11.23 -# djangorestframework-jwt==1.11.0 -djangorestframework==3.7.1 -drf-writable-nested==0.5.1 -git+git://github.com/scidash/neuronunit@metacell#egg=neuronunit -git+git://github.com/MetaCell/scidash-api.git@master#egg=scidash_api -hyperlink==18.0.0 # via twisted -idna==2.8 # via hyperlink, requests -igor==0.3 -imageio==2.6.1 # via scikit-image -importlib-metadata==1.3.0 # via jsonschema -incremental==17.5.0 # via twisted -ipykernel==5.1.3 # via ipyparallel -ipyparallel==6.2.4 -ipython-genutils==0.2.0 # via ipyparallel, nbformat, traitlets -ipython==7.10.2 # via ipykernel, ipyparallel -jedi==0.15.2 # via ipython -jinja2==2.11.3 # via allensdk, bokeh, nbconvert -jsonschema==3.2.0 # via nbformat -jupyter-client==5.3.4 # via ipykernel, ipyparallel -jupyter-core==4.6.1 # via jupyter-client, nbconvert, nbformat -kiwisolver==1.1.0 # via matplotlib -kombu==4.3.0 # via celery -lazyarray==0.3.3 # via pynn -libneuroml==0.2.47 -llvmlite==0.30.0 # via numba -lmfit==1.0.0 -locket==0.2.0 # via partd -lxml==4.4.2 # via libneuroml -markupsafe==1.1.1 # via jinja2 -matplotlib==3.1.2 # via allensdk, scikit-image -mistune==0.8.4 # via nbconvert -more-itertools==8.0.2 # via zipp -msgpack==0.6.2 # via distributed -nbconvert==5.6.1 -nbformat==4.4.0 # via nbconvert -neo==0.5.2 # via elephant, pynn -networkx==2.4 # via scikit-image -neuromllite==0.1.9 -numba==0.46.0 -numpy==1.18.0 # via allensdk, bokeh, dask, deap, efel, elephant, h5py, imageio, lazyarray, lmfit, matplotlib, neo, numba, pandas, patsy, pynn, pynrrd, pywavelets, scipy, statsmodels -packaging==19.2 # via bokeh -pandas==0.25.3 # via allensdk, dask, statsmodels -pandocfilters==1.4.2 # via nbconvert -parso==0.5.2 # via jedi -partd==1.1.0 # via dask -patsy==0.5.1 # via statsmodels -pexpect==4.7.0 # via ipython -pickleshare==0.7.5 # via ipython -pillow==6.2.1 # via bokeh, imageio, scikit-image -prompt-toolkit==3.0.2 # via ipython -psutil==5.6.7 # via distributed -psycopg2==2.7.7 -pyhamcrest==1.9.0 # via twisted -pyjwt==1.7.1 # via djangorestframework-jwt -pylems==0.4.9.3 -git+https://github.com/rgerkin/pyneuroml@master#egg=pyneuroml-9999 +django-db-logger +neo==0.5.2 pynn==0.9.5 -pynrrd==0.4.1 # via allensdk -pyparsing==2.4.6 # via matplotlib, packaging -pyrsistent==0.15.6 # via jsonschema -python-crontab==2.3.6 # via django-celery-beat -python-dateutil==2.8.0 # via python-crontab -pytz==2018.9 # via celery, django, django-timezone-field -redis==2.10.6 # via celery -rest-framework-cache==0.1 -sentry-sdk==1.0.0 -six==1.12.0 # via autobahn, automat, django-extensions, pyhamcrest, python-dateutil, txaio -twisted==18.9.0 # via daphne -txaio==18.8.1 # via autobahn -vine==1.3.0 # via amqp -wcwidth==0.1.7 # via prompt-toolkit -webencodings==0.5.1 # via bleach -wheel==0.33.6 -zict==1.0.0 # via distributed -zipp==0.6.0 # via importlib-metadata -zope.interface==4.6.0 # via twisted - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +Jinja2==2.11.3 +git+git://github.com/scidash/neuronunit@metacell +git+git://github.com/MetaCell/scidash-api.git@master +wheel +sentry-sdk +django-ckeditor==5.9.0 +django-admin-sortable2==0.7.5 +social-auth-app-django==4.0.0 # will be installed through install script install-backend diff --git a/scidash/main/settings.py b/scidash/main/settings.py index 714a27a4..d9ed014a 100644 --- a/scidash/main/settings.py +++ b/scidash/main/settings.py @@ -111,8 +111,9 @@ # TWITTER # https://python-social-auth.readthedocs.io/en/latest/backends/twitter.html -SOCIAL_AUTH_TWITTER_KEY = '' -SOCIAL_AUTH_TWITTER_SECRET = '' +SOCIAL_AUTH_TWITTER_KEY = 'YLbWDorRWSsO1FQo5kanraUzt' +SOCIAL_AUTH_TWITTER_SECRET = '2D8ICyjXOMssEdfaw0v8Qtyb2vEGpFUYTjLdIZ1YiMJE0TR0rx' +# twitter bearer token: AAAAAAAAAAAAAAAAAAAAAPJuPgEAAAAAhP2wPOYLMrjP0RNRzfFGj%2BUgJrE%3DlEjIikC9mLUfDpQsVMyPuAK4f5k4TNHQHLXVGqmkeDVEzbPkv2 # GITHUB # https://python-social-auth.readthedocs.io/en/latest/backends/github.html diff --git a/service/docker/Dockerfile-scidash b/service/docker/Dockerfile-scidash index 7b656377..9c8781ad 100644 --- a/service/docker/Dockerfile-scidash +++ b/service/docker/Dockerfile-scidash @@ -29,7 +29,7 @@ RUN apt-get install -y gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libc libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 \ libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 \ libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 \ - lsb-release xdg-utils wget curl llvm python3-tk + lsb-release xdg-utils wget curl llvm python3-tk RUN curl -sL https://deb.nodesource.com/setup_10.x | bash RUN apt-get update && apt-get -y install nodejs RUN curl https://www.npmjs.com/install.sh | sh @@ -52,7 +52,6 @@ RUN git config --global user.email "scidash@metacell.us" RUN git config --global user.name "SciDash" WORKDIR $APP_DIR/scidash -RUN virtualenv venv-py -p python3.6 WORKDIR $APP_DIR/scidash RUN make ARGS="-b $targetBranch" install-backend-with-env diff --git a/service/scripts/install-backend.sh b/service/scripts/install-backend.sh index 4df359d0..ad9f051f 100755 --- a/service/scripts/install-backend.sh +++ b/service/scripts/install-backend.sh @@ -29,17 +29,14 @@ done set -- "${POSITIONAL[@]}" # restore positional parameters if [ "$virtualenv" = true ] ; then - virtualenv -p python3.6 ./venv; - source ./venv/bin/activate; + python -m venv venv + source ./venv/bin/activate fi -python -m pip install pip==9.0.3 -pip install -r requirements.txt; +# python -m pip install pip==9.0.3 python3 -m pip install --upgrade pip - -# pip3 install social-auth-app-django==4.0.0 -# pip uninstall -y sciunit -# pip install git+git://github.com/ddelpiano/sciunit@4.0.0#egg=sciunit +pip install Jinja2==2.11.3 --no-cache-dir +pip install -r requirements.txt --no-cache-dir git ls-remote --heads --tags $pygeppetto_django_repo | grep -E 'refs/(heads|tags)/'$pygeppetto_branch > /dev/null