diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-26 12:53:15 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-26 12:53:15 -0700 |
| commit | 769fbac0353d1efb4213c78f5ec22a1247e4da9d (patch) | |
| tree | 4e6781297384caa2608f2493f36b80c44ef70a48 | |
| parent | 8dfc2b79cbf86e8e5fce4b7a6cedf9c4b5be706d (diff) | |
| parent | 162eebf704b5111d34f430488868d3185d51ba21 (diff) | |
Merge branch '1.13' into 1.14
Conflicts:
paramiko/__init__.py
setup.py
sites/www/changelog.rst
| -rw-r--r-- | paramiko/__init__.py | 3 | ||||
| -rw-r--r-- | paramiko/_version.py | 2 | ||||
| -rw-r--r-- | setup.py | 9 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 2ebc8a65..65f6f8a2 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -17,14 +17,13 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. import sys +from paramiko._version import __version__, __version_info__ if sys.version_info < (2, 6): raise RuntimeError('You need Python 2.6+ for this module.') __author__ = "Jeff Forcier <jeff@bitprophet.org>" -__version__ = "1.14.1" -__version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/paramiko/_version.py b/paramiko/_version.py new file mode 100644 index 00000000..f941ac22 --- /dev/null +++ b/paramiko/_version.py @@ -0,0 +1,2 @@ +__version_info__ = (1, 14, 2) +__version__ = '.'.join(map(str, __version_info__)) @@ -54,9 +54,16 @@ if sys.platform == 'darwin': setup_helper.install_custom_make_tarball() +# Version info -- read without importing +_locals = {} +with open('paramiko/_version.py') as fp: + exec(fp.read(), None, _locals) +version = _locals['__version__'] + + setup( name = "paramiko", - version = "1.14.1", + version = version, description = "SSH2 protocol library", long_description = longdesc, author = "Jeff Forcier", diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 426a9ee3..b8110393 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -4,6 +4,8 @@ Changelog * :support:`378 backported` Minor code cleanup in the SSH config module courtesy of Olle Lundberg. +* :support:`249` Consolidate version information into one spot. Thanks to Gabi + Davar for the reminder. * :release:`1.14.1 <2014-08-25>` * :release:`1.13.2 <2014-08-25>` * :bug:`376` Be less aggressive about expanding variables in ``ssh_config`` |