From fe38a088e7ea9d602ce327226ad93e977f2a30c2 Mon Sep 17 00:00:00 2001 From: Erik Rose Date: Thu, 24 Nov 2011 20:13:24 -0800 Subject: Remove SPOT for version, because __init__ throws a SyntaxError when imported from setup.py. --- blessings/__init__.py | 4 +--- docs/conf.py | 2 +- setup.py | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/blessings/__init__.py b/blessings/__init__.py index e83fb5c..67bbddb 100644 --- a/blessings/__init__.py +++ b/blessings/__init__.py @@ -6,9 +6,8 @@ try: from io import UnsupportedOperation as IOUnsupportedOperation except ImportError: class IOUnsupportedOperation(Exception): - """A dummy exception to take the place of Python 3's io.UnsupportedOperation one in Python 2""" + """A dummy exception to take the place of Python 3's ``io.UnsupportedOperation`` in Python 2""" pass -import locale import os from os import isatty, environ import struct @@ -17,7 +16,6 @@ from termios import TIOCGWINSZ __all__ = ['Terminal'] -__version__ = (1, 1) class Terminal(object): diff --git a/docs/conf.py b/docs/conf.py index a1c2f49..040b29a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ copyright = u'2011, The Mozilla Foundation' # built documents. # # The short X.Y version. -version = '.'.join(str(i) for i in blessings.__version__) +version = '1.2' # The full version, including alpha/beta/rc tags. release = version diff --git a/setup.py b/setup.py index 4450589..617eb5f 100644 --- a/setup.py +++ b/setup.py @@ -2,8 +2,6 @@ import sys from setuptools import setup, find_packages -from blessings import __version__ - extra_setup = {} if sys.version_info >= (3,): @@ -11,7 +9,7 @@ if sys.version_info >= (3,): setup( name='blessings', - version='.'.join(str(i) for i in __version__), + version='1.2', description='A thin, practical wrapper around terminal formatting, positioning, and more', long_description=open('README.rst').read(), author='Erik Rose', @@ -37,6 +35,6 @@ setup( 'Topic :: Software Development :: User Interfaces', 'Topic :: Terminals' ], - keywords=['terminal', 'tty', 'curses', 'formatting', 'color', 'console'], + keywords=['terminal', 'tty', 'curses', 'ncurses', 'formatting', 'color', 'console'], **extra_setup ) -- cgit v1.2.1