From b232bc20d55e981f43b75f7dbdc96ded41d58bfb Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Mon, 2 Mar 2015 09:19:22 -0800 Subject: [PATCH] Fixed import issue with __version__. Thank you @meshy and @longjos for identifying the problem. --- HISTORY.rst | 6 ++++++ docs/conf.py | 2 +- eventbrite/__init__.py | 3 +-- eventbrite/_version.py | 4 ---- eventbrite/access_methods.py | 1 - eventbrite/client.py | 4 ++-- setup.py | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 eventbrite/_version.py diff --git a/HISTORY.rst b/HISTORY.rst index f8b3a26..ebb8322 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,12 @@ History ------- +3.0.3 (2014-03-02) +------------------ + +* Fixed import issue with ``__version__``. Thank you @meshy and @longjos for identifying the problem. +* + 3.0.2 (2014-01-30) ------------------ diff --git a/docs/conf.py b/docs/conf.py index e1ef7cc..7a89eb7 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -56,7 +56,7 @@ # General information about the project. project = u'eventbrite-sdk-python' -copyright = u'2014, Eventbrite' +copyright = u'2015, Eventbrite' # The version info for the project you're documenting, acts as replacement # for |version| and |release|, also used in various other places throughout diff --git a/eventbrite/__init__.py b/eventbrite/__init__.py index 258aeb8..6f15bd2 100755 --- a/eventbrite/__init__.py +++ b/eventbrite/__init__.py @@ -3,8 +3,7 @@ __author__ = 'Daniel Greenfeld' __email__ = 'danny@eventbrite.com' - -from ._version import __version__ +__version__ = '3.0.3' from .client import Eventbrite diff --git a/eventbrite/_version.py b/eventbrite/_version.py deleted file mode 100644 index 19619b8..0000000 --- a/eventbrite/_version.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -__version__ = '3.0.1' diff --git a/eventbrite/access_methods.py b/eventbrite/access_methods.py index da5a8b8..da4aceb 100644 --- a/eventbrite/access_methods.py +++ b/eventbrite/access_methods.py @@ -74,7 +74,6 @@ def get_event(self, id, **data): """ - return self.get("/events/{0}/".format(id), data=data) def get_event_ticket_classes(self, id, **data): diff --git a/eventbrite/client.py b/eventbrite/client.py index 3479ce0..e71434a 100755 --- a/eventbrite/client.py +++ b/eventbrite/client.py @@ -13,6 +13,7 @@ InvalidWebhook, InternetConnectionError ) +from . import __version__ from .models import EventbriteObject from .utils import ( format_path, @@ -20,7 +21,6 @@ get_webhook_from_request, EVENTBRITE_API_URL ) -from . import _version class Eventbrite(AccessMethodsMixin): @@ -37,7 +37,7 @@ def headers(self): "Authorization": "Bearer {0}".format(self.oauth_token), "content-type": "application/json", "User-Agent": "eventbrite-python-sdk {version} ({system})".format( - version=_version.__version__, + version=__version__, system=platform(), ) } diff --git a/setup.py b/setup.py index 8a72e94..0cc4ae7 100755 --- a/setup.py +++ b/setup.py @@ -8,9 +8,7 @@ except ImportError: from distutils.core import setup -from eventbrite import __version__ - -version = __version__ +__version__ = '3.0.3' if sys.argv[-1] == 'tag': os.system("git tag -a %s -m 'version %s'" % (version, version)) @@ -55,6 +53,8 @@ keywords='eventbrite', classifiers=[ 'Development Status :: 4 - Beta', + 'Framework :: Django', + 'Framework :: Flask', 'Intended Audience :: Developers', 'License :: OSI Approved :: Apache Software License', 'Natural Language :: English',