Merge branch 'dev' into update-docs

CHANGELOG

@@ -3,6 +3,12 @@
 This file list notable changes for TabPy project releases.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## v0.3.2
+
+- Remove versioneer and just replace it with VERSION file
+- Require Python 3.6.5
+- Require jsonschema to be compatible with 2.3.0
+
 ## v0.3.1
 
 - Fixed dependency on tabpy-tools in startup scripts

CONTRIBUTING.md

@@ -68,18 +68,6 @@ or npm [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli).
 
 TOC for markdown file is built with [markdonw-toc](https://www.npmjs.com/package/markdown-toc).
 
-## Versioning
-
-TabPy is versioned with [Versioneer tool](https://github.com/warner/python-versioneer) and uses the github release
-tag as a version. In case you need to update version for TabPy use `git tag` command. Example below
-shows how to update TabPy version to `v3.14-gamma`:
-
-```sh
-git tag v3.14-gamma
-git push
-git push --tag
-```
-
 ## TabPy with Swagger
 
 You can invoke TabPy Server API against running TabPy instance with Swagger:

VERSION

@@ -0,0 +1 @@
+0.3.2

tabpy-server/server_tests/test_config.py

@@ -87,7 +87,7 @@ def test_config_file_present(self, mock_os, mock_path_exists, mock_psws, mock_sh
         mock_os.getenv.assert_has_calls(getenv_calls, any_order=True)
         self.assertEqual(settings['log_level'], 'WARNING')
         self.assertEqual(settings['port'], 1234)
-        self.assertEquals(settings['server_version'], tabpy_server.__version__)
+        self.assertEqual(settings['server_version'], open('VERSION').read().strip())
         self.assertEquals(settings['bind_ip'], '0.0.0.0')
         self.assertEquals(settings['upload_dir'], 'foo')
         self.assertEquals(settings['state_file_path'], 'bar')

tabpy-server/setup.py

@@ -1,23 +1,27 @@
-import versioneer
 try:
     from setuptools import setup
 except ImportError as err:
     print("Missing Python module requirement: setuptools.")
     raise err
 
+def read_version():
+    with open('../VERSION') as h:
+        return h.read().strip()
+
+__version__=read_version()
 
 setup(
     name='tabpy-server',
-    python_requires='>=3.7.2',
-    version=versioneer.get_version(),
+    python_requires='>=3.6.5',
+    version=__version__,
     description='Web server Tableau uses to run Python scripts.',
     url='https://github.com/tableau/TabPy',
     author='Tableau',
     author_email='[email protected]',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         "Topic :: Scientific/Engineering",
         "Topic :: Scientific/Engineering :: Information Analysis",
     ],
@@ -36,7 +40,7 @@
         'decorator',
         'future',
         'genson',
-        'jsonschema>=2.3.0',
+        'jsonschema~=2.3.0',
         'mock',
         'numpy',
         'python-dateutil',
@@ -45,7 +49,7 @@
         'singledispatch',
         'simplejson',
         'tornado==5.1.1',
-        'Tornado-JSON'
-    ],
-    cmdclass=versioneer.get_cmdclass(),
+        'Tornado-JSON',
+        'urllib3'
+    ]
 )

tabpy-server/tabpy_server/__init__.py

@@ -1,4 +0,0 @@
-
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions