Merge pull request #243 from python-cmd2/release_prep

Abandoned official support for Python 3.3
python-cmd2 · Jan 4, 2018 · 5f97663 · 5f97663
2 parents 63b0c6b + c447ee4
commit 5f97663
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,9 +7,6 @@ matrix:
         - os: linux
           python: 2.7
           env: TOXENV=py27
-        - os: linux
-          python: 3.3
-          env: TOXENV=py33
         - os: linux
           python: 3.4
           env: TOXENV=py34

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,12 @@
-## 0.7.9 (TBD)
+## 0.7.9 (January 4, 2018)
 
 * Bug Fixes
     * Fixed a couple broken examples
 * Enhancements
     * Improved documentation for modifying shortcuts (command aliases)
     * Made ``pyreadline`` a dependency on Windows to ensure tab-completion works
+* Other changes
+    * Abandoned official support for Python 3.3.  It should still work, just don't have an easy way to test it anymore.
 
 ## 0.7.8 (November 8, 2017)
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -44,10 +44,10 @@ The tables below list all prerequisites along with the minimum required version
 
 | Prerequisite                                        | Minimum Version |
 | --------------------------------------------------- | --------------- |
-| [Python](https://www.python.org/downloads/)         | `3.3 or 2.7`    |
+| [Python](https://www.python.org/downloads/)         | `3.4 or 2.7`    |
 | [six](https://pypi.python.org/pypi/six)             | `1.8`           |
 | [pyparsing](http://pyparsing.wikispaces.com)        | `2.0.3`         |
-| [pyperclip](https://github.com/asweigart/pyperclip) | `1.5`           |
+| [pyperclip](https://github.com/asweigart/pyperclip) | `1.6`           |
 
 #### Additional prerequisites to run cmd2 unit tests
 

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Main Features
 - Parsing commands with flags
 - Unicode character support (*Python 3 only*)
 - Good tab-completion of commands, file system paths, and shell commands
-- Python 2.7 and 3.3+ support
+- Python 2.7 and 3.4+ support
 - Linux, macOS and Windows support
 - Trivial to provide built-in help for all commands
 - Built-in regression testing framework for your applications (transcript-based testing)
@@ -46,7 +46,7 @@ On all operating systems, the latest stable version of `cmd2` can be installed u
 pip install -U cmd2
 ```
 
-cmd2 works with Python 2.7 and Python 3.3+ on Windows, macOS, and Linux. It is pure Python code with
+cmd2 works with Python 2.7 and Python 3.4+ on Windows, macOS, and Linux. It is pure Python code with
 the only 3rd-party dependencies being on [six](https://pypi.python.org/pypi/six),
 [pyparsing](http://pyparsing.wikispaces.com), and [pyperclip](https://github.com/asweigart/pyperclip) 
 (on Windows, [pyreadline](https://pypi.python.org/pypi/pyreadline) is an additional dependency).

diff --git a/cmd2.py b/cmd2.py
@@ -53,16 +53,6 @@
     # noinspection PyUnresolvedReferences
     from pyperclip import PyperclipException
 
-# On some systems, pyperclip will import gtk for its clipboard functionality.
-# The following code is a workaround for gtk interfering with printing from a background
-# thread while the CLI thread is blocking in raw_input() in Python 2 on Linux.
-try:
-    # noinspection PyUnresolvedReferences
-    import gtk
-    gtk.set_interactive(0)
-except ImportError:
-    pass
-
 # next(it) gets next item of iterator it. This is a replacement for calling it.next() in Python 2 and next(it) in Py3
 from six import next
 
@@ -105,7 +95,18 @@
 else:
     BROKEN_PIPE_ERROR = IOError
 
-__version__ = '0.7.9a'
+# On some systems, pyperclip will import gtk for its clipboard functionality.
+# The following code is a workaround for gtk interfering with printing from a background
+# thread while the CLI thread is blocking in raw_input() in Python 2 on Linux.
+if six.PY2 and sys.platform.startswith('lin'):
+    try:
+        # noinspection PyUnresolvedReferences
+        import gtk
+        gtk.set_interactive(0)
+    except ImportError:
+        pass
+
+__version__ = '0.7.9'
 
 # Pyparsing enablePackrat() can greatly speed up parsing, but problems have been seen in Python 3 in the past
 pyparsing.ParserElement.enablePackrat()

diff --git a/docs/conf.py b/docs/conf.py
@@ -62,7 +62,7 @@
 # The short X.Y version.
 version = '0.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.8'
+release = '0.7.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -72,7 +72,7 @@ Contents:
 Compatibility
 =============
 
-Tested and working with Python 2.7 and 3.3+.
+Tested and working with Python 2.7 and 3.4+.
 
 Indices and tables
 ==================

diff --git a/docs/install.rst b/docs/install.rst
@@ -7,7 +7,7 @@ This section covers the basics of how to install, upgrade, and uninstall ``cmd2`
 
 Installing
 ----------
-First you need to make sure you have Python 2.7 or Python 3.3+, pip_, and setuptools_.  Then you can just use pip to
+First you need to make sure you have Python 2.7 or Python 3.4+, pip_, and setuptools_.  Then you can just use pip to
 install from PyPI_.
 
 .. _pip: https://pypi.python.org/pypi/pip

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 import sys
 from setuptools import setup
 
-VERSION = '0.7.9a'
+VERSION = '0.7.9'
 DESCRIPTION = "cmd2 - a tool for building interactive command line applications in Python"
 LONG_DESCRIPTION = """cmd2 is a tool for building interactive command line applications in Python. Its goal is to make 
 it quick and easy for developers to build feature-rich and user-friendly interactive command line applications.  It 
@@ -32,7 +32,7 @@
     - Parsing commands with flags
     - Unicode character support (*Python 3 only*)
     - Good tab-completion of commands, file system paths, and shell commands
-    - Python 2.7 and 3.3+ support
+    - Python 2.7 and 3.4+ support
     - Linux, macOS and Windows support
     - Trivial to provide built-in help for all commands
     - Built-in regression testing framework for your applications (transcript-based testing)
@@ -52,7 +52,6 @@
 Programming Language :: Python :: 2
 Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
-Programming Language :: Python :: 3.3
 Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5
 Programming Language :: Python :: 3.6

diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
@@ -24,7 +24,7 @@
 
 
 def test_ver():
-    assert cmd2.__version__ == '0.7.9a'
+    assert cmd2.__version__ == '0.7.9'
 
 
 def test_empty_statement(base_app):

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,py35,py36,py36-winpy37,pypy
+envlist = py27,py34,py35,py36,py36-win,py37
 
 [pytest]
 testpaths = tests
@@ -40,16 +40,6 @@ commands =
   py.test {posargs: -n 2} --cov=cmd2 --cov-report=term-missing
   codecov
 
-[testenv:py33]
-deps =
-  mock
-  pyparsing
-  pyperclip
-  pytest
-  pytest-xdist
-  six
-commands = py.test -v -n2
-
 [testenv:py34]
 deps =
   mock