From 2107796f07f88492169620568e067a3f2e3bf84c Mon Sep 17 00:00:00 2001
From: John Krauss <irving.krauss@gmail.com>
Date: Tue, 12 Jul 2016 17:49:34 -0400
Subject: [PATCH 1/3] updates to NEWS.md and observatory.control

---
 NEWS.md                    | 19 +++++++++++++++++++
 src/pg/observatory.control |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index ef6a0dc..663710b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,22 @@
+1.0.2 (2016-07-12)
+---
+
+__Bugfixes__
+
+* Fix for `OBS_GetCategory` outside the US ([#135](https://github.com/CartoDB/observatory-extension/pull/137))
+
+__Improvements__
+
+* Automated tests cover Mexico data
+* `obs_meta` is now provisioned during unit tests
+* `OBS_GetMeasureByID` uses `obs_meta` internally, which should help
+  performance
+* `OBS_GetCategory` uses `obs_meta` internally, which should help perfromance
+* `OBS_GetCategory` will pick the correct category for an arbitrary polygon
+  (the category covering the highest % of that polygon)
+* Fixtures are only loaded at the start of the unit test suite, and dropped at the end,
+  instead of at the start/end of each individual test file
+
 1.0.1 (2016-07-01)
 ---
 
diff --git a/src/pg/observatory.control b/src/pg/observatory.control
index 8e6dc0d..2c39fb6 100644
--- a/src/pg/observatory.control
+++ b/src/pg/observatory.control
@@ -1,5 +1,5 @@
 comment = 'CartoDB Observatory backend extension'
-default_version = '1.0.1'
+default_version = '1.0.2'
 requires = 'postgis'
 superuser = true
 schema = cdb_observatory

From e4052ed5655bb7e8afb7b8d1d1639b87c6dcf2bf Mon Sep 17 00:00:00 2001
From: John Krauss <irving.krauss@gmail.com>
Date: Wed, 13 Jul 2016 10:59:25 -0400
Subject: [PATCH 2/3] better feedback in autotest

---
 scripts/autotest.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/autotest.py b/scripts/autotest.py
index 7c2426c..4e24924 100644
--- a/scripts/autotest.py
+++ b/scripts/autotest.py
@@ -110,6 +110,7 @@ def default_area(column_id):
 
 @parameterized(US_CENSUS_MEASURE_COLUMNS)
 def test_get_us_census_measure_points(name):
+    print 'test_get_us_census_measure_points, ', name
     resp = query('''
 SELECT * FROM {schema}OBS_GetUSCensusMeasure({point}, '{name}')
                  '''.format(name=name.replace("'", "''"),
@@ -123,6 +124,7 @@ SELECT * FROM {schema}OBS_GetUSCensusMeasure({point}, '{name}')
 
 @parameterized(MEASURE_COLUMNS)
 def test_get_measure_areas(column_id, point_only):
+    print 'test_get_measure_areas, ', column_id, point_only
     if point_only:
         return
     resp = query('''
@@ -138,6 +140,7 @@ SELECT * FROM {schema}OBS_GetMeasure({area}, '{column_id}')
 
 @parameterized(MEASURE_COLUMNS)
 def test_get_measure_points(column_id, point_only):
+    print 'test_get_measure_points, ', column_id, point_only
     resp = query('''
 SELECT * FROM {schema}OBS_GetMeasure({point}, '{column_id}')
                  '''.format(column_id=column_id,
@@ -162,6 +165,7 @@ SELECT * FROM {schema}OBS_GetMeasure({point}, '{column_id}')
 
 @parameterized(CATEGORY_COLUMNS)
 def test_get_category_points(column_id):
+    print 'test_get_category_points, ', column_id
     resp = query('''
 SELECT * FROM {schema}OBS_GetCategory({point}, '{column_id}')
                  '''.format(column_id=column_id,

From 0090e537fc9de87ac290be251cd75c62f2bb8d3d Mon Sep 17 00:00:00 2001
From: John Krauss <irving.krauss@gmail.com>
Date: Wed, 13 Jul 2016 11:07:06 -0400
Subject: [PATCH 3/3] add comment-notices branch merge to NEWS.md

---
 NEWS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS.md b/NEWS.md
index 663710b..b6fced3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -16,6 +16,7 @@ __Improvements__
   (the category covering the highest % of that polygon)
 * Fixtures are only loaded at the start of the unit test suite, and dropped at the end,
   instead of at the start/end of each individual test file
+* Comment noisy NOTICEs ([#73](https://github.com/CartoDB/observatory-extension/issues/73))
 
 1.0.1 (2016-07-01)
 ---