diff --git a/falcon/__init__.py b/falcon/__init__.py index d978f14..3537e1a 100644 --- a/falcon/__init__.py +++ b/falcon/__init__.py @@ -32,12 +32,12 @@ DEFAULT_MEDIA_TYPE = 'application/json; charset=utf-8' # Hoist classes and functions into the falcon namespace -from falcon.version import version # NOQA -from falcon.api import API, DEFAULT_MEDIA_TYPE # NOQA -from falcon.status_codes import * # NOQA -from falcon.exceptions import * # NOQA -from falcon.http_error import HTTPError # NOQA -from falcon.util import dt_to_http # NOQA -from falcon.hooks import before # NOQA -from falcon.request import Request # NOQA -from falcon.response import Response # NOQA \ No newline at end of file +from .version import version # NOQA +from .api import API, DEFAULT_MEDIA_TYPE # NOQA +from .status_codes import * # NOQA +from .exceptions import * # NOQA +from .http_error import HTTPError # NOQA +from .util import dt_to_http # NOQA +from .hooks import before # NOQA +from .request import Request # NOQA +from .response import Response # NOQA \ No newline at end of file diff --git a/falcon/cython-setup.py b/falcon/cython-setup.py deleted file mode 100644 index 3d093ba..0000000 --- a/falcon/cython-setup.py +++ /dev/null @@ -1,23 +0,0 @@ -from distutils.core import setup -from distutils.extension import Extension -from Cython.Distutils import build_ext - -module_names = ( - 'api', - 'api_helpers', - 'request', - 'request_helpers', - 'response', - 'response_helpers', - 'responders', - 'http_error', - 'exceptions' -) - -ext_modules = [Extension(m, [m + '.py']) for m in module_names] - -setup( - name='Falcon', - cmdclass={'build_ext': build_ext}, - ext_modules=ext_modules -) diff --git a/publish.sh b/publish.sh index 0da2a63..b0e354c 100755 --- a/publish.sh +++ b/publish.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -python setup.py bdist_egg upload +#python setup.py bdist_egg upload python setup.py sdist upload diff --git a/setup.py b/setup.py index 5088646..31856a6 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,9 @@ +import imp from os import path from setuptools import setup, find_packages, Extension -import falcon.version +version = imp.load_source('version', path.join('.', 'falcon', 'version.py')) +version = version.version try: from Cython.Distutils import build_ext @@ -35,7 +37,7 @@ else: setup( name='falcon', - version=falcon.version, + version=version, description='A fast micro-framework for building cloud APIs.', long_description=None, classifiers=[ @@ -49,7 +51,7 @@ setup( 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', 'Topic :: Internet :: WWW/HTTP :: WSGI', - 'Topic :: Software Development :: Libraries :: Application Frameworks' + 'Topic :: Software Development :: Libraries :: Application Frameworks', 'Programming Language :: Python', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy',