Commit fa00f59b authored by Joshua Roesslein's avatar Joshua Roesslein
Browse files

Merge branch 'version' of git://github.com/alejandrogomez/tweepy

Conflicts:
	setup.py
parents 9f244c04 46298e31
...@@ -48,9 +48,12 @@ copyright = u'2011, Joshua Roesslein' ...@@ -48,9 +48,12 @@ copyright = u'2011, Joshua Roesslein'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '1.7' sys.path.insert(0, '..')
from tweepy import __version__
version = __version__
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.7' release = __version__
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
#!/usr/bin/env python #!/usr/bin/env python
#from distutils.core import setup #from distutils.core import setup
from setuptools import setup, find_packages from setuptools import setup, find_packages
from tweepy import __version__
setup(name="tweepy", setup(name="tweepy",
version="1.12", version=__version__,
description="Twitter library for python", description="Twitter library for python",
license="MIT", license="MIT",
author="Joshua Roesslein", author="Joshua Roesslein",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment