Merge branch 'dev' into test

HXLStandard · Dec 2, 2016 · dd052fb · dd052fb
2 parents 3c1d6a8 + 6e15e2e
commit dd052fb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+2016-12-02 Release 1.0
 	- added support for JSON recipes via a &recipe HTTP parameter
 	- add row queries for clean, count, deduplicate, replace, and
 	  replace-map filters

diff --git a/README.md b/README.md
@@ -5,6 +5,8 @@ Python-/flask-based web proxy for transforming a HXL dataset
 dynamically. Currently runs only in Python 2.7+, but Python 3 support
 is close.
 
+User documentation is available at https://github.com/HXLStandard/hxl-proxy/wiki
+
 # Installation
 
 Installation from PyPi:

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 setuptools.setup(
     name = 'hxl-proxy',
     packages = ['hxl_proxy'],
-    version = '0.6',
+    version = '1.0',
     description = 'Flask-based web proxy for HXL',
     author='David Megginson',
     author_email='[email protected]',