From b6e820d792759a3f67f352e84f60618b0a4b34ba Mon Sep 17 00:00:00 2001 From: Mike Helmick Date: Mon, 29 Apr 2013 12:04:22 -0400 Subject: [PATCH] Remove version.py for now Was causing conflicts on pip install --- .gitignore | 3 ++- setup.py | 3 +-- twython/__init__.py | 1 + twython/twython.py | 2 +- twython/version.py | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 twython/version.py diff --git a/.gitignore b/.gitignore index 5684153..4382a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ nosetests.xml # Mr Developer .mr.developer.cfg .project -.pydevproject \ No newline at end of file +.pydevproject +twython/.DS_Store diff --git a/setup.py b/setup.py index dc9e006..8b7702b 100755 --- a/setup.py +++ b/setup.py @@ -1,11 +1,10 @@ import os import sys -from twython.version import __version__ - from setuptools import setup __author__ = 'Ryan McGrath ' +__version__ = '2.8.0' packages = [ 'twython' diff --git a/twython/__init__.py b/twython/__init__.py index fc493ae..76ce26c 100644 --- a/twython/__init__.py +++ b/twython/__init__.py @@ -18,6 +18,7 @@ Questions, comments? ryan@venodesigns.net """ __author__ = 'Ryan McGrath ' +__version__ = '2.8.0' from .twython import Twython from .exceptions import TwythonError, TwythonRateLimitError, TwythonAuthError diff --git a/twython/twython.py b/twython/twython.py index 5f0b631..1297436 100644 --- a/twython/twython.py +++ b/twython/twython.py @@ -4,11 +4,11 @@ import warnings import requests from requests_oauthlib import OAuth1 +from . import __version__ from .advisory import TwythonDeprecationWarning from .compat import json, urlencode, parse_qsl, quote_plus from .endpoints import api_table from .exceptions import TwythonError, TwythonAuthError, TwythonRateLimitError -from .version import __version__ warnings.simplefilter('always', TwythonDeprecationWarning) # For Python 2.7 > diff --git a/twython/version.py b/twython/version.py deleted file mode 100644 index f2df444..0000000 --- a/twython/version.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = '2.8.0'