Merge branch 'master' into 621-no-print

LICENCE.rst

@@ -1,10 +1,10 @@
 Cove - COnvert Validate & Explore
 =================================
 
-Note: This license doesn't apply to the OCDS theme and related assets (such as the logo).
+Note: This license doesn't apply to the OCDS or 360Giving theme and related assets (such as the logo).
 
 Cove - COnvert Validate & Explore is free software designed to help people check data 
-pubplished to the Open Contracting Data Standard.
+published to various different data standards.
 
 Cove - COnvert Validate & Explore is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by

cove/management/commands/upload.py

@@ -0,0 +1,18 @@
+from django.core.management.base import BaseCommand
+from cove.input.models import SuppliedData
+from django.core.files import File
+from os.path import split
+
+
+class Command(BaseCommand):
+    help = 'Upload a file from the commandline, and return a Cove data url.'
+
+    def add_arguments(self, parser):
+        parser.add_argument('file_name', type=str)
+
+    def handle(self, *args, file_name, **options):
+        data = SuppliedData()
+        head, tail = split(file_name)
+        data.original_file.save(tail, File(open(file_name)))
+        data.save()
+        return data.get_absolute_url()

requirements.txt

@@ -1,29 +1,30 @@
 pip==9.0.1
 Django==1.8.18 # rq.filter: <1.9
 -e git+https://github.com/OpenDataServices/flatten-tool.git@dc376d5b4199fb8c798f49230abde93609aa4ad0#egg=flattentool
-django-bootstrap3==8.2.1
-django-debug-toolbar==1.7
-requests==2.13.0
+django-bootstrap3==8.2.3
+django-debug-toolbar==1.8
+requests==2.18.1
 cached-property==1.3.0
 dealer==2.0.5
-django-environ==0.4.1
+django-environ==0.4.3
 jsonschema==2.6.0
 json-merge-patch==0.1
-raven==6.0.0
+raven==6.1.0
 strict-rfc3339==0.7
 rfc3987==1.3.7
 rfc6266==0.0.4
 ## The following requirements were added by pip freeze:
-appdirs==1.4.3
-contextlib2==0.5.4
+certifi==2017.4.17
+chardet==3.0.4
+contextlib2==0.5.5
 et-xmlfile==1.0.1
+idna==2.5
 jdcal==1.3
 jsonref==0.1
 LEPL==5.1.3
 openpyxl==2.3.5
-packaging==16.8
-pyparsing==2.2.0
 pytz==2017.2
-schema==0.6.5
+schema==0.6.6
 six==1.10.0
 sqlparse==0.2.3
+urllib3==1.21.1

requirements_dev.txt

@@ -1,62 +1,62 @@
 pip==9.0.1
 Django==1.8.18 # rq.filter: <1.9
 -e git+https://github.com/OpenDataServices/flatten-tool.git@dc376d5b4199fb8c798f49230abde93609aa4ad0#egg=flattentool
-django-bootstrap3==8.2.1
-django-debug-toolbar==1.7
-requests==2.13.0
+django-bootstrap3==8.2.3
+django-debug-toolbar==1.8
+requests==2.18.1
 cached-property==1.3.0
 dealer==2.0.5
-django-environ==0.4.1
+django-environ==0.4.3
 jsonschema==2.6.0
 json-merge-patch==0.1
-raven==6.0.0
+raven==6.1.0
 strict-rfc3339==0.7
 rfc3987==1.3.7
 rfc6266==0.0.4
-
 flake8==3.3.0
-pytest==3.0.7
+pytest==3.1.2
 pytest-django==3.1.2
-pytest-cov==2.4.0
-pytest-localserver==0.3.6
-pytest-xdist==1.15.0
+pytest-cov==2.5.1
+pytest-localserver==0.3.7
+pytest-xdist==1.18.0
 coveralls==1.1
 selenium==2.53.6
 transifex-client==0.12.4
-libsass==0.12.3
-Sphinx==1.5.3
+libsass==0.13.2
+Sphinx==1.6.2
 recommonmark==0.4.0
-hypothesis==3.7.0
+hypothesis==3.11.6
 ## The following requirements were added by pip freeze:
 alabaster==0.7.10
 apipkg==1.4
-appdirs==1.4.3
 Babel==2.4.0
+certifi==2017.4.17
+chardet==3.0.4
 CommonMark==0.5.4
-contextlib2==0.5.4
-coverage==4.3.4
+contextlib2==0.5.5
+coverage==4.4.1
 docopt==0.6.2
 docutils==0.13.1
 et-xmlfile==1.0.1
 execnet==1.4.1
+idna==2.5
 imagesize==0.7.1
 jdcal==1.3
-Jinja2==2.9.5
+Jinja2==2.9.6
 jsonref==0.1
 LEPL==5.1.3
 MarkupSafe==1.0
 mccabe==0.6.1
 openpyxl==2.3.5
-packaging==16.8
-py==1.4.33
+py==1.4.34
 pycodestyle==2.3.1
 pyflakes==1.5.0
 Pygments==2.2.0
-pyparsing==2.2.0
 pytz==2017.2
-schema==0.6.5
+schema==0.6.6
 six==1.10.0
 snowballstemmer==1.2.1
+sphinxcontrib-websupport==1.0.1
 sqlparse==0.2.3
-urllib3==1.20
-Werkzeug==0.12.1
+urllib3==1.21.1
+Werkzeug==0.12.2