From f991f5a1e6dc602ccdbcfa8adacd4e04d77559d6 Mon Sep 17 00:00:00 2001
From: John Krauss <irving.krauss@gmail.com>
Date: Fri, 12 Aug 2016 18:56:06 +0000
Subject: [PATCH] docs and NEWS for the new tests

---
 NEWS.md                    |  7 +++++++
 src/pg/observatory.control |  2 +-
 src/python/test/README.md  | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 src/python/test/README.md

diff --git a/NEWS.md b/NEWS.md
index bfbb82e..775e43b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,10 @@
+1.0.5 (2016-08-12)
+
+__Improvements__
+
+* Integration tests moved to `src/python/test/`, and can be run without hitting
+  any HTTP SQL API.
+
 1.0.4 (2016-07-26)
 
 __Bugfixes__
diff --git a/src/pg/observatory.control b/src/pg/observatory.control
index 20d9a45..2df0450 100644
--- a/src/pg/observatory.control
+++ b/src/pg/observatory.control
@@ -1,5 +1,5 @@
 comment = 'CartoDB Observatory backend extension'
-default_version = '1.0.4'
+default_version = '1.0.5'
 requires = 'postgis, postgres_fdw'
 superuser = true
 schema = cdb_observatory
diff --git a/src/python/test/README.md b/src/python/test/README.md
new file mode 100644
index 0000000..b72703a
--- /dev/null
+++ b/src/python/test/README.md
@@ -0,0 +1,14 @@
+### Integration/performance tests
+
+Tests here are meant to be run on a box with an Observatory meta/data dump
+loaded and ready to be tested against the API.
+
+The local Python needs the requirements in `src/python/requirements.txt`.
+
+In order to find and access the correct database, the `PGUSER`, `PGPASSWORD`,
+`PGHOST`, `PGPORT` and `PGDATABASE` env variables should be set.
+
+Tests should be executed as follows:
+
+     nosetests test/autotest.py
+     nosetests -s test/perftest.py