From ef0afa207b552490a6c79e59f77ac6904885401a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ruair=C3=AD=20=C3=93=20Fathaigh?= Date: Wed, 8 Nov 2017 14:10:15 +0000 Subject: [PATCH] Fix missing file when downloading project. Fix issue with requirement version --- portia_server/portia_api/utils/download.py | 2 ++ portia_server/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/portia_server/portia_api/utils/download.py b/portia_server/portia_api/utils/download.py index 7983ca399..ee5726696 100644 --- a/portia_server/portia_api/utils/download.py +++ b/portia_server/portia_api/utils/download.py @@ -205,6 +205,8 @@ def read_file(self, filename, deserialize=False): except IOError as e: if filename in ('items.json', 'extractors.json'): return {} if deserialize else '{}' + elif filename in FILE_TEMPLATES: + return FILE_TEMPLATES[filename] raise e if deserialize and contents is not None: return json.loads(contents) diff --git a/portia_server/requirements.txt b/portia_server/requirements.txt index 7b64a13c2..12daf9b6a 100644 --- a/portia_server/requirements.txt +++ b/portia_server/requirements.txt @@ -6,7 +6,7 @@ dj-database-url==0.4.2 drf-nested-routers==0.11.1 dulwich==0.18.4 marshmallow==2.8.0 -marshmallow_jsonapi==0.10.2 +marshmallow_jsonapi==0.10.0 MySQL-python==1.2.5 requests==2.18.4 toposort==1.5