Merge pull request #31 from mercycorps/npm

Upgrade python libraries
mercycorps · May 7, 2020 · 1477691 · 1477691
2 parents 8ebb4ce + 23887ca
commit 1477691
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 41 deletions.
diff --git a/dataviz/templates/global_dashboard.html b/dataviz/templates/global_dashboard.html
@@ -1,9 +1,7 @@
 {% extends 'pdviz/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load crispy_forms_tags %}
-<!-- TODO: make department react to donor selection-->
-<!-- TODO: default text for department -->
-<!-- TODO: clean up file -->
+
 {% block content %}
  <div id="donor_categories_data_div" style="display: none;">{{ donor_categories|safe }}</div>
  <div id="donor_categories_drilldown_data_div" style="display: none;">{{ donors|safe }}</div>

diff --git a/dataviz/views.py b/dataviz/views.py
@@ -34,7 +34,7 @@ def get_regions(kwargs):
  num_total=Count(
  Case(
  When(
- Q(countries__grants__status__isnull = False) &
+ Q(countries__grants__status__isnull=False) &
  ~Q(countries__grants__status='Concept') &
  ~Q(countries__grants__status='Development') &
  ~Q(countries__grants__status='No-Response') &

diff --git a/pdviz/templates/pdviz/base.html b/pdviz/templates/pdviz/base.html
@@ -1,5 +1,5 @@
 {# Stuff that's common to every non-error-page on the site #}
-{% load static from staticfiles %}
+{% load static from static %}
 
 <!DOCTYPE html>
 <html lang="en">

diff --git a/pdviz/templates/pdviz/index.html b/pdviz/templates/pdviz/index.html
@@ -1,5 +1,5 @@
 {% extends 'pdviz/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 
  <div class="jumbotron">

diff --git a/pdviz/urls.py b/pdviz/urls.py
@@ -12,16 +12,16 @@
 
 
 router = routers.DefaultRouter()
-router.register('grants', GrantViewSet, base_name='grants')
-router.register('grants_by_country', GrantsByCountryViewSet, base_name='grants_by_country')
-router.register('donors', DonorViewSet, base_name='donors')
-router.register('countries', CountryViewSet, base_name='countries')
-router.register('donorcategories', DonorCategoryViewSet, base_name='donorcategories')
-router.register('donordepartments', DonorDepartmentViewSet, base_name='donordepartments')
-router.register('sector', SectorViewSet, base_name='sectors')
-router.register('subsector', SubSectorViewSet, base_name='subsectors')
-router.register('methodologies', MethodologyViewSet, base_name='methodologies')
-router.register('themes', ThemeViewSet, base_name='themes')
+router.register('grants', GrantViewSet, basename='grants')
+router.register('grants_by_country', GrantsByCountryViewSet, basename='grants_by_country')
+router.register('donors', DonorViewSet, basename='donors')
+router.register('countries', CountryViewSet, basename='countries')
+router.register('donorcategories', DonorCategoryViewSet, basename='donorcategories')
+router.register('donordepartments', DonorDepartmentViewSet, basename='donordepartments')
+router.register('sector', SectorViewSet, basename='sectors')
+router.register('subsector', SubSectorViewSet, basename='subsectors')
+router.register('methodologies', MethodologyViewSet, basename='methodologies')
+router.register('themes', ThemeViewSet, basename='themes')
 
 
 urlpatterns = [

diff --git a/requirements.txt b/requirements.txt
@@ -4,40 +4,47 @@
 #
 # pip-compile
 #
-certifi==2019.9.11 # via requests
+asgiref==3.2.7 # via django
+certifi==2020.4.5.1 # via requests
+cffi==1.14.0 # via cryptography
 chardet==3.0.4 # via requests
-click==7.0  # via pip-tools
+click==7.1.2 # via pip-tools
 coreapi==2.3.3 # via django-rest-swagger, openapi-codec
 coreschema==0.0.4 # via coreapi
+cryptography==2.9.2 # via social-auth-core
 defusedxml==0.6.0 # via python3-openid, python3-saml, social-auth-core
-django-crispy-forms==1.7.2
-django-rest-swagger==2.2.0
-django==2.2.5
-djangorestframework==3.10.3
-idna==2.8 # via requests
+django-crispy-forms==1.9.0 # via -r requirements.in
+django-rest-swagger==2.2.0 # via -r requirements.in
+django==3.0.6 # via -r requirements.in, djangorestframework
+djangorestframework==3.11.0 # via -r requirements.in, django-rest-swagger
+idna==2.9 # via requests
 isodate==0.6.0 # via python3-saml
-itypes==1.1.0 # via coreapi
-jinja2==2.10.1 # via coreschema
-lxml==4.4.2 # via xmlsec
+itypes==1.2.0 # via coreapi
+jinja2==2.11.2 # via coreschema
+lxml==4.5.0 # via xmlsec
 markupsafe==1.1.1 # via jinja2
-mysqlclient==1.4.4
+mysqlclient==1.4.6 # via -r requirements.in
 oauthlib==3.1.0 # via requests-oauthlib, social-auth-core
 openapi-codec==1.3.2 # via django-rest-swagger
-pip-tools==4.3.0
+pip-tools==5.1.2 # via -r requirements.in
 pkgconfig==1.5.1 # via xmlsec
+pycparser==2.20 # via cffi
 pyjwt==1.7.1 # via social-auth-core
-python-memcached==1.59
+python-memcached==1.59 # via -r requirements.in
 python3-openid==3.1.0 # via social-auth-core
-python3-saml==1.9.0
-pytz==2019.2 # via django
-pyyaml==5.2
+python3-saml==1.9.0 # via -r requirements.in, social-auth-core
+pytz==2020.1 # via django
+pyyaml==5.3.1 # via -r requirements.in
 requests-oauthlib==1.3.0 # via social-auth-core
-requests==2.22.0 # via coreapi, requests-oauthlib, social-auth-core
-simplejson==3.16.0 # via django-rest-swagger
-six==1.12.0 # via isodate, pip-tools, python-memcached, social-auth-app-django, social-auth-core
-social-auth-app-django==3.1.0
-social-auth-core[saml]==3.2.0
-sqlparse==0.3.0 # via django
-uritemplate==3.0.0 # via coreapi
-urllib3==1.25.6 # via requests
+requests==2.23.0 # via coreapi, requests-oauthlib, social-auth-core
+simplejson==3.17.0 # via django-rest-swagger
+six==1.14.0 # via cryptography, isodate, pip-tools, python-memcached, social-auth-app-django, social-auth-core
+social-auth-app-django==3.1.0 # via -r requirements.in
+social-auth-core[saml]==3.3.3 # via -r requirements.in, social-auth-app-django
+sqlparse==0.3.1 # via django
+uritemplate==3.0.1 # via coreapi
+urllib3==1.25.9 # via requests
 xmlsec==1.3.3 # via python3-saml
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip