From 3e764c6cc76e910315820cd8d7530725d8a5a763 Mon Sep 17 00:00:00 2001 From: Zoran Sinnema Date: Tue, 17 Dec 2019 21:09:37 +0100 Subject: [PATCH 1/2] fix: initial timestamp from/to, search max settings.SCIDASH_INITIAL_SEARCH_QUARTERS quarters back, if not found show settings.SCIDASH_INITIAL_SEARCH_QUARTERS quarters back period --- scidash/sciunittests/views.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/scidash/sciunittests/views.py b/scidash/sciunittests/views.py index a70d419c..99e91b50 100644 --- a/scidash/sciunittests/views.py +++ b/scidash/sciunittests/views.py @@ -17,16 +17,10 @@ def get(self, request, *args, **kwargs): day=current_date.day ) - three_month_ago = current_date_iso - three_month_period - six_month_ago = three_month_ago - three_month_period - nine_month_ago = six_month_ago - three_month_period - tvelwe_month_ago = nine_month_ago - three_month_period - acceptable_period = None - for period in [ - three_month_ago, six_month_ago, nine_month_ago, tvelwe_month_ago - ]: + for quarter in range(1, s.SCIDASH_INITIAL_SEARCH_QUARTERS + 1): + period = current_date_iso - quarter*three_month_period count = ScoreInstance.objects.filter( timestamp__gte=period, timestamp__lt=current_date_iso ).count() @@ -36,7 +30,7 @@ def get(self, request, *args, **kwargs): break if acceptable_period is None: - acceptable_period = tvelwe_month_ago + acceptable_period = period return Response( { From fe9df74c66c572ad76fbcc4d47ce68fd3d9ab099 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2020 14:55:33 +0000 Subject: [PATCH 2/2] Bump django from 1.11.7 to 1.11.23 Bumps [django](https://github.com/django/django) from 1.11.7 to 1.11.23. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/1.11.7...1.11.23) Signed-off-by: dependabot[bot] --- requirements.in | 2 +- requirements.txt | 126 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 120 insertions(+), 8 deletions(-) diff --git a/requirements.in b/requirements.in index 04185443..5c1d6477 100644 --- a/requirements.in +++ b/requirements.in @@ -1,5 +1,5 @@ psycopg2 -django==1.11.7 +django==1.11.23 channels==2.1.2 djangorestframework==3.7.1 drf-writable-nested diff --git a/requirements.txt b/requirements.txt index 813c6d41..b36df93f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,17 +4,43 @@ # # pip-compile # +airspeed==0.5.4dev-20150515 +allensdk==0.14.5 amqp==2.4.2 # via kombu +apipkg==1.5 # via execnet +argparse==1.4.0 # via scoop asgiref==2.3.2 # via channels +asteval==0.9.18 # via lmfit async-timeout==3.0.1 # via asgiref -attrs==19.1.0 # via automat, twisted +attrs==19.1.0 # via automat, jsonschema, twisted autobahn==19.3.3 # via daphne automat==0.7.0 # via twisted +backcall==0.1.0 # via ipython +backports.tempfile==1.0 +backports.weakref==1.0.post1 # via backports.tempfile +beautifulsoup4==4.8.2 # via bs4 billiard==3.5.0.5 # via celery +bleach==3.1.0 # via nbconvert +git+https://github.com/russelljjarvis/BluePyOpt@scidash#egg=bluepyopt-9999 +bokeh==1.4.0 # via dask +bs4==0.0.1 +cachetools==0.8.0 # via airspeed celery[redis]==4.2.2 +cerberus==1.3.2 +certifi==2019.11.28 # via requests channels==2.1.2 +chardet==3.0.4 # via requests +click==7.0 # via distributed +cloudpickle==1.2.2 # via dask, distributed constantly==15.1.0 # via twisted +cycler==0.10.0 # via matplotlib +cypy==0.2.0 daphne==2.2.5 # via channels +dask[complete]==2.9.1 # 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.1 # via dask django-celery-beat==1.4.0 django-celery-results==1.0.4 django-db-logger==0.1.7 @@ -23,25 +49,111 @@ 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.7 +django==1.11.23 djangorestframework-jwt==1.11.0 djangorestframework==3.7.1 drf-writable-nested==0.5.1 -git+git://github.com/ddelpiano/neuronunit@4.0.0#egg=neuronunit +efel==3.0.70 +elephant==0.4.1 +entrypoints==0.3 # via nbconvert +execnet==1.7.1 +fsspec==0.6.2 # via dask +future==0.18.2 # via allensdk +gitdb2==2.0.6 # via gitpython +gitpython==3.0.5 +greenlet==0.4.15 # via scoop +h5py==2.10.0 # via allensdk +heapdict==1.0.1 # via zict hyperlink==18.0.0 # via twisted -idna==2.8 # via hyperlink +idna==2.8 # via hyperlink, requests +igor==0.3 +imageio==2.6.1 # via scikit-image 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.11.1 # via ipykernel, ipyparallel +jedi==0.15.2 # via ipython +jinja2==2.10.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 +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 +git+git://github.com/ddelpiano/neuronunit@4.0.0#egg=neuronunit +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==7.0.0 # via bokeh, imageio, scikit-image +prompt-toolkit==3.0.2 # via ipython +psutil==5.6.7 # via distributed psycopg2==2.7.7 +ptyprocess==0.6.0 # via pexpect +pygments==2.5.2 # via ipython, nbconvert 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 +pynn==0.9.5 +pynrrd==0.4.2 # 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 +python-dateutil==2.8.0 # via bokeh, ipyparallel, jupyter-client, matplotlib, pandas, python-crontab +pytz==2018.9 # via celery, django, django-timezone-field, pandas +pywavelets==1.1.1 # via scikit-image +pyyaml==5.2 # via bokeh, dask, distributed +pyzmq==18.1.1 # via ipyparallel, jupyter-client, scoop +quantities==0.12.1 # via elephant, neo, pynn redis==2.10.6 # via celery +requests-toolbelt==0.9.1 # via allensdk +requests==2.22.0 # via allensdk, requests-toolbelt rest-framework-cache==0.1 -six==1.12.0 # via autobahn, automat, django-extensions, pyhamcrest, python-dateutil, txaio +scikit-image==0.16.2 # via allensdk +scipy==1.4.1 # via allensdk, elephant, lmfit, scikit-image, statsmodels +git+https://github.com/scidash/sciunit@dev#egg=sciunit-9999 +scoop==0.7.1.1 +simpleitk==1.2.4 # via allensdk +simplejson==3.17.0 # via allensdk +six==1.12.0 # via airspeed, allensdk, autobahn, automat, bleach, bokeh, cycler, django-extensions, efel, elephant, h5py, jsonschema, libneuroml, packaging, patsy, pyhamcrest, pyrsistent, python-dateutil, traitlets, txaio, validators +smmap2==2.0.5 # via gitdb2 +sortedcontainers==2.1.0 # via distributed +soupsieve==1.9.5 # via beautifulsoup4 +statsmodels==0.10.2 # via allensdk +tblib==1.6.0 # via distributed +testpath==0.4.4 # via nbconvert +toolz==0.10.0 # via dask, distributed, partd +tornado==6.0.3 # via bokeh, distributed, ipykernel, ipyparallel, jupyter-client +traitlets==4.3.3 # via ipykernel, ipyparallel, ipython, jupyter-client, jupyter-core, nbconvert, nbformat twisted==18.9.0 # via daphne txaio==18.8.1 # via autobahn +uncertainties==3.1.2 # via lmfit +urllib3==1.25.7 # via requests +validators==0.14.1 vine==1.3.0 # via amqp +wcwidth==0.1.8 # via prompt-toolkit +webencodings==0.5.1 # via bleach +zict==1.0.0 # via distributed zope.interface==4.6.0 # via twisted