Merge pull request #88 from jirikuncar/packaging

global: packaging cleanup

.travis.yml

@@ -3,8 +3,8 @@ dist: trusty
 
 language: python
 python:
-    - 3.5
-    - 3.6
+  - 3.5
+  - 3.6
 
 services:
   - docker
@@ -13,14 +13,14 @@ before_install:
   - docker pull leifurhauks/gremlin-server-tinkergraph
 
 install:
-  - pip install -r requirements.txt
+  - pip install -e .[all]
   - docker run -d --name gst -p 8182:8182 leifurhauks/gremlin-server-tinkergraph
 
 before_script:
   - sleep 30
 
 script:
-  - coverage run --source=goblin setup.py test
+  - python setup.py test
 
 after_success:
   - coveralls

MANIFEST.in

@@ -0,0 +1,5 @@
+include *.txt
+include *.yml
+include LICENSE NOTICE
+prune tests
+prune docs

NOTICE

@@ -0,0 +1,5 @@
+Goblin
+Copyright 2017 - David M. Brown
+Copyright 2017 - Swiss Data Science Center (SDSC)
+A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
+Eidgenössische Technische Hochschule Zürich (ETHZ).

docs/conf.py

@@ -67,10 +67,16 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-version = '0.1.1'
+# Get the version string. Cannot be done with import!
+g = {}
+with open(os.path.join(os.path.dirname(__file__), '..',
+                       'goblin', 'version.py'),
+          'rt') as fp:
+    exec(fp.read(), g)
+    version = g['__version__']
+
 # The full version, including alpha/beta/rc tags.
-release = '0.1.1'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -366,4 +372,5 @@
 intersphinx_mapping = {
     'https://docs.python.org/3/': None,
     'aiohttp': ('http://aiohttp.readthedocs.org/en/stable/', None),
-    'aiogremlin': ('http://aiogremlin.readthedocs.io/en/latest/', None)}
+    'aiogremlin': ('http://aiogremlin.readthedocs.io/en/latest/', None),
+}

goblin/version.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+"""Version information for Goblin.
+
+This file is imported by ``goblin.__init__``,
+and parsed by ``setup.py``.
+"""
+
+__version__ = '2.1.0'

setup.cfg

@@ -2,4 +2,8 @@
 test=pytest
 
 [tool:pytest]
-norecursedirs = '.*', 'build', 'dist', 'CVS', '_darcs', '{arch}', '*.egg' lib lib64
+# addopts = --pep8 --doctest-glob="*.rst" --doctest-modules --cov=goblin --cov-report=term-missing
+addopts = --cov=goblin --cov-report=term-missing
+doctest_optionflags = ALLOW_UNICODE ALLOW_BYTES DONT_ACCEPT_TRUE_FOR_1 ELLIPSIS IGNORE_EXCEPTION_DETAIL
+pep8ignore = docs/conf.py ALL
+testpaths = docs goblin tests

setup.py

@@ -1,26 +1,71 @@
-from setuptools import setup
+# -*- coding: utf-8 -*-
+"""Python toolkit for Tinker Pop 3 Gremlin Server"""
 
+import os
 
-setup(
-    name="goblin",
-    version="2.1.0",
-    url="",
-    license="AGPL",
-    author="davebshow",
-    author_email="davebshow@gmail.com",
-    description="Python toolkit for TP3 Gremlin Server",
-    packages=["goblin", "goblin.driver"],
-    install_requires=[
-        "aiogremlin==3.2.6rc1",
-        "inflection==0.3.1",
+from setuptools import find_packages, setup
+
+tests_require = [
+    'check-manifest>=0.25',
+    'coverage>=4.0',
+    'isort>=4.2.2',
+    'pydocstyle>=1.0.0',
+    'pytest-asyncio>=0.8.0',
+    'pytest-cache>=1.0',
+    'pytest-cov>=2.5.1',
+    'pytest-pep8>=1.0.6',
+    'pytest>=3.2.1',
+]
+
+extras_require = {
+    'docs': [
+        'Sphinx>=1.6.3',
+        'alabaster>=0.7.10',
     ],
-    test_suite="tests",
-    setup_requires=['pytest-runner'],
-    tests_require=['pytest-asyncio', 'pytest'],
+    'tests': tests_require,
+}
+
+extras_require['all'] = []
+for name, reqs in extras_require.items():
+    extras_require['all'].extend(reqs)
+
+setup_requires = [
+    'pytest-runner>=2.6.2',
+]
+
+install_requires = [
+    'aiogremlin==3.2.6rc1',
+    'gremlinpython==3.2.6',
+    'inflection==0.3.1',
+]
+
+packages = find_packages()
+
+# Get the version string. Cannot be done with import!
+g = {}
+with open(os.path.join('goblin', 'version.py'), 'rt') as fp:
+    exec(fp.read(), g)
+    version = g['__version__']
+
+
+setup(
+    name='goblin',
+    version=version,
+    url='https://github.com/davebshow/goblin',
+    license='Apache License 2.0',
+    author='davebshow',
+    author_email='davebshow@gmail.com',
+    description=__doc__,
+    packages=packages,
+    install_requires=install_requires,
+    extras_require=extras_require,
+    test_suite='tests',
+    setup_requires=setup_requires,
+    tests_require=tests_require,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: Apache License, Version 2.0,
-        'Operating System :: OS Independent'
-    ]
+        'License :: OSI Approved :: Apache License, Version 2.0',
+        'Operating System :: OS Independent',
+    ],
 )