Fix packaging

Author: Marco Paolini

.gitignore

@@ -5,4 +5,7 @@ __pycache__
 /build/
 /.wheelhouse/
 /.python-version
+/.tox
+/.cache
+/dist/
 

README.md

@@ -1,10 +1,10 @@
 # libgraphql cython port
 
-Python2.7+ (includes python3) class-based bindings to libgraphql
+Python2.7+ Python3.4+ class-based bindings to libgraphqlparser
 
 See usage example in `examples/visitor_example.py`
 
-This bindings are still experimental.
+Still **EXPERIMENTAL**
 
 
 ## Building from source
@@ -34,3 +34,9 @@ Make sure `libgraphql` is available to the loader in your `LD_LIBRARY_PATH`
 - Unicode string handling not yet complete (a mixture of bytes and strings all over)
 - Exceptions in the visitor's class callbacks are ignored
 - libgraphqlparser is **dynamically** linked but It would be better if it was linked statically
+
+
+## TODO
+
+- build and upload wheels to pypi
+- build more wheel packages for linux 32 bit and other platforms

examples/visitor_example.py

@@ -1,7 +1,7 @@
 import sys
 
-import GraphQLAstVisitor
-import GraphQLParser
+from graphql_parser import GraphQLAstVisitor
+from graphql_parser import GraphQLParser
 
 
 class Visitor(GraphQLAstVisitor.GraphQLAstVisitor):

graphql_parser/__init__.py

@@ -1,29 +1,26 @@
-from distutils.core import setup
-from distutils.extension import Extension
-import os
+from setuptools import setup, Extension
 
 from Cython.Build import cythonize
 
-LIBGRAPHQLPARSER_HOME = os.environ.get('LIBGRAPHQLPARSER_HOME', './libgraphqlparser')
-
+extensions = cythonize([
+    Extension('graphql_parser.{}'.format(cls_name),
+              ['graphql_parser/{}.pyx'.format(cls_name)],
+              libraries=['graphqlparser'],
+              include_dirs=['.'])
+    for cls_name in ['GraphQLParser', 'GraphQLAstVisitor',
+                     'GraphQLAst', 'GraphQLAstNode']
+])
 
 setup(
     name='graphqlparser',
-    version='0.0.1',
+    version='0.0.2',
     author='Marco Paolini',
     author_email='[email protected]',
     description='Python bindings for libgraphqlparser (Cython-based)',
+    long_description='Graphql parser based on libgraphql with Cython-based bindings',
     url='https://github.com/elastic-coders/py-graphqlparser',
-    ext_modules=cythonize(
-        Extension("grahpql_parser",
-                  ["graphql_parser/GraphQLParser.pyx",
-                   "graphql_parser/GraphQLAstVisitor.pyx",
-                   "graphql_parser/GraphQLAst.pyx",
-                   "graphql_parser/GraphQLAstNode.pyx"],
-                  libraries=['graphqlparser'],
-                  library_dirs=[LIBGRAPHQLPARSER_HOME]
-              )
-    ),
+    packages=['graphql_parser'],
+    ext_modules=extensions,
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Environment :: Console',

setup.py

@@ -2,11 +2,11 @@
 
 
 def test_parse_ok():
-    import GraphQLParser
+    from graphql_parser import GraphQLParser
     assert GraphQLParser.graphql_parse_string('{query {id}}')
 
 
 def test_parse_bad():
-    import GraphQLParser
+    from graphql_parser import GraphQLParser
     with pytest.raises(GraphQLParser.GraphQLParseError):
         assert GraphQLParser.graphql_parse_string('{query {id')

tests/test_parse.py

@@ -0,0 +1,7 @@
+[tox]
+envlist=py27,py33,py34,py35
+
+[testenv]
+deps = pytest
+     Cython
+commands=py.test