From 6849078d88017419c159b9effd57ed83311f3da1 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Wed, 10 Jun 2020 23:29:56 +0200
Subject: [PATCH] Change location of constants and dependencies

---
 .gitignore                       | 2 +-
 app/preprocessing.py             | 2 +-
 app/request_datasets.py          | 2 +-
 app/constants.py => constants.py | 0
 shell.nix                        | 3 ++-
 tests/preprocessing_test.py      | 5 ++++-
 6 files changed, 9 insertions(+), 5 deletions(-)
 rename app/constants.py => constants.py (100%)

diff --git a/.gitignore b/.gitignore
index ee2c7ca..cf451d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-*/__pycache__
+**/__pycache__
 Design.org
 data/*.json
diff --git a/app/preprocessing.py b/app/preprocessing.py
index 3dcc574..c9456c7 100644
--- a/app/preprocessing.py
+++ b/app/preprocessing.py
@@ -1,6 +1,6 @@
 from json import load
 from pandas import json_normalize, DataFrame
-from .constants import FILES, COLUMNS
+from constants import FILES, COLUMNS
 
 
 def open_json(dataset) -> dict:
diff --git a/app/request_datasets.py b/app/request_datasets.py
index 0e1534f..946195d 100644
--- a/app/request_datasets.py
+++ b/app/request_datasets.py
@@ -1,6 +1,6 @@
 from json import dump
 from requests import get
-from .constants import FILES, URL
+from constants import FILES, URL
 
 
 def format_url(dataset) -> str:
diff --git a/app/constants.py b/constants.py
similarity index 100%
rename from app/constants.py
rename to constants.py
diff --git a/shell.nix b/shell.nix
index 589b92a..790e533 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,8 +7,9 @@ pkgs.mkShell {
     # Dependencies
     pandas
     requests
-    flask
+    starlette
     altair
+    folium
     pytest
     # Development tools
     black
diff --git a/tests/preprocessing_test.py b/tests/preprocessing_test.py
index 07d4ba5..8fa6a43 100644
--- a/tests/preprocessing_test.py
+++ b/tests/preprocessing_test.py
@@ -1,5 +1,8 @@
-from app.constants import files
+from constants import FILES, DATASETS, URL
 from app.preprocessing import create_dataframe
+from app.request_datasets import request_dataset
+from pandas import DataFrame
+from requests import get
 from os import remove