summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-04-11 18:30:30 +0200
committeremkael <emkael@tlen.pl>2017-04-11 18:30:30 +0200
commit2f691416e159fa6a1fc5413bbec3f86acb3096ab (patch)
tree82d6a7cc7f2d01f5577b3b37a4a6705a4c6eed7d
parent56a98e9c45a5427cb47676d8888bef69ac8a9e77 (diff)
Config files cleaned up
-rw-r--r--.gitattributes2
-rw-r--r--config/dates.json3
-rw-r--r--config/db.json (renamed from config.json)bin149 -> 149 bytes
-rw-r--r--config/test-dates.json (renamed from test-dates.json)2
-rw-r--r--dates.json3
-rw-r--r--pyranking/db.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes
index 7daec9b..17366f1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-config.json filter=git-crypt diff=git-crypt
+config/db.json filter=git-crypt diff=git-crypt
diff --git a/config/dates.json b/config/dates.json
new file mode 100644
index 0000000..7dfdd66
--- /dev/null
+++ b/config/dates.json
@@ -0,0 +1,3 @@
+{
+ "2016-12-31": "."
+}
diff --git a/config.json b/config/db.json
index 9db40bf..9db40bf 100644
--- a/config.json
+++ b/config/db.json
Binary files differ
diff --git a/test-dates.json b/config/test-dates.json
index f3692ae..f417da7 100644
--- a/test-dates.json
+++ b/config/test-dates.json
@@ -1,4 +1,4 @@
{
"2016-12-31": "2017-01.html",
- "2017-04-30": ""
+ "2017-04-30": "."
}
diff --git a/dates.json b/dates.json
deleted file mode 100644
index e3fbcd5..0000000
--- a/dates.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "2016-12-31": ""
-}
diff --git a/pyranking/db.py b/pyranking/db.py
index d28147d..16595d3 100644
--- a/pyranking/db.py
+++ b/pyranking/db.py
@@ -1,7 +1,7 @@
import json
import mysql.connector
-settings = json.load(file('config.json'))
+settings = json.load(file('config/db.json'))
connection = mysql.connector.connect(
user=settings['user'],