From 176d2e523c09b62b9e09c6b3139131602a61f375 Mon Sep 17 00:00:00 2001 From: Kaustubh Maske Patil <37668193+nikochiko@users.noreply.github.com> Date: Fri, 1 Nov 2019 19:41:57 +0530 Subject: [PATCH 1/5] Updated installation instructions on virutalenv Updated instructions on virtualenv. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 636b38d92..7b14b3647 100644 --- a/README.md +++ b/README.md @@ -188,6 +188,12 @@ To install Docker for Mac [click here](https://docs.docker.com/docker-for-mac/in ``` * Exit psql by typing in \q and hitting enter. +* Now update settings/dev.py. Change the username from 'postgres' to 'admin' and password from 'postgres' to 'fabrik' + The final code should look like this (Lines 13 and 14): + ``` + 'USER': os.environ.get("POSTGRES_USER", 'admin'), + 'PASSWORD': os.environ.get("POSTGRES_PASSWORD", 'fabrik') + ``` * Migrate From 5633dd7d3671fb580cc567f2a1782842a5205854 Mon Sep 17 00:00:00 2001 From: Kaustubh Maske Patil <37668193+nikochiko@users.noreply.github.com> Date: Tue, 5 Nov 2019 12:48:51 +0530 Subject: [PATCH 2/5] Update README.md --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 7b14b3647..e514f54f2 100644 --- a/README.md +++ b/README.md @@ -188,12 +188,6 @@ To install Docker for Mac [click here](https://docs.docker.com/docker-for-mac/in ``` * Exit psql by typing in \q and hitting enter. -* Now update settings/dev.py. Change the username from 'postgres' to 'admin' and password from 'postgres' to 'fabrik' - The final code should look like this (Lines 13 and 14): - ``` - 'USER': os.environ.get("POSTGRES_USER", 'admin'), - 'PASSWORD': os.environ.get("POSTGRES_PASSWORD", 'fabrik') - ``` * Migrate @@ -255,6 +249,7 @@ To install Docker for Mac [click here](https://docs.docker.com/docker-for-mac/in python manage.py runserver ``` + 6. Open http://localhost:8000/admin 7. Login with the credentials from step 4. From 4909ca6b97a540c566a197885337f5addeb774f8 Mon Sep 17 00:00:00 2001 From: Kaustubh Maske Patil <37668193+nikochiko@users.noreply.github.com> Date: Tue, 5 Nov 2019 13:11:09 +0530 Subject: [PATCH 3/5] test --- tests/unit/caffe_app/test_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/caffe_app/test_views.py b/tests/unit/caffe_app/test_views.py index 09f532a54..b565f40d0 100644 --- a/tests/unit/caffe_app/test_views.py +++ b/tests/unit/caffe_app/test_views.py @@ -50,8 +50,8 @@ def test_caffe_import_by_input(self): {'config': sample_file.read()}) response = json.loads(response.content) self.assertEqual(response['result'], 'error') - self.assertEqual(response['error'], 'Invalid Prototxt\n' - '1:1 : Expected identifier or number, got {.') + self.assertEqual(response['error'], "Invalid Prototxt\n" + "1:1 : '{': Expected identifier or number, got {.") def test_caffe_import_by_url(self): url = 'https://github.com/Cloud-CV/Fabrik/blob/master/example/caffe/All_CNN.prototxt' From 1610cd61714611080b049a3f726d085bc3fb3b03 Mon Sep 17 00:00:00 2001 From: nikochiko Date: Fri, 22 Nov 2019 20:59:44 +0530 Subject: [PATCH 4/5] Revert "test" This reverts commit 4909ca6b97a540c566a197885337f5addeb774f8. --- tests/unit/caffe_app/test_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/caffe_app/test_views.py b/tests/unit/caffe_app/test_views.py index b565f40d0..09f532a54 100644 --- a/tests/unit/caffe_app/test_views.py +++ b/tests/unit/caffe_app/test_views.py @@ -50,8 +50,8 @@ def test_caffe_import_by_input(self): {'config': sample_file.read()}) response = json.loads(response.content) self.assertEqual(response['result'], 'error') - self.assertEqual(response['error'], "Invalid Prototxt\n" - "1:1 : '{': Expected identifier or number, got {.") + self.assertEqual(response['error'], 'Invalid Prototxt\n' + '1:1 : Expected identifier or number, got {.') def test_caffe_import_by_url(self): url = 'https://github.com/Cloud-CV/Fabrik/blob/master/example/caffe/All_CNN.prototxt' From cc5bde61834b0b017e90cb748d0191436f212cbd Mon Sep 17 00:00:00 2001 From: nikochiko Date: Fri, 22 Nov 2019 20:59:50 +0530 Subject: [PATCH 5/5] Revert "Update README.md" This reverts commit 5633dd7d3671fb580cc567f2a1782842a5205854. --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e514f54f2..7b14b3647 100644 --- a/README.md +++ b/README.md @@ -188,6 +188,12 @@ To install Docker for Mac [click here](https://docs.docker.com/docker-for-mac/in ``` * Exit psql by typing in \q and hitting enter. +* Now update settings/dev.py. Change the username from 'postgres' to 'admin' and password from 'postgres' to 'fabrik' + The final code should look like this (Lines 13 and 14): + ``` + 'USER': os.environ.get("POSTGRES_USER", 'admin'), + 'PASSWORD': os.environ.get("POSTGRES_PASSWORD", 'fabrik') + ``` * Migrate @@ -249,7 +255,6 @@ To install Docker for Mac [click here](https://docs.docker.com/docker-for-mac/in python manage.py runserver ``` - 6. Open http://localhost:8000/admin 7. Login with the credentials from step 4.