Skip to content

Commit 5f97663

Browse files
authored
Merge pull request #243 from python-cmd2/release_prep
Abandoned official support for Python 3.3
2 parents 63b0c6b + c447ee4 commit 5f97663

File tree

11 files changed

+26
-37
lines changed

11 files changed

+26
-37
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ matrix:
77
- os: linux
88
python: 2.7
99
env: TOXENV=py27
10-
- os: linux
11-
python: 3.3
12-
env: TOXENV=py33
1310
- os: linux
1411
python: 3.4
1512
env: TOXENV=py34

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
## 0.7.9 (TBD)
1+
## 0.7.9 (January 4, 2018)
22

33
* Bug Fixes
44
* Fixed a couple broken examples
55
* Enhancements
66
* Improved documentation for modifying shortcuts (command aliases)
77
* Made ``pyreadline`` a dependency on Windows to ensure tab-completion works
8+
* Other changes
9+
* Abandoned official support for Python 3.3. It should still work, just don't have an easy way to test it anymore.
810

911
## 0.7.8 (November 8, 2017)
1012

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ The tables below list all prerequisites along with the minimum required version
4444

4545
| Prerequisite | Minimum Version |
4646
| --------------------------------------------------- | --------------- |
47-
| [Python](https://www.python.org/downloads/) | `3.3 or 2.7` |
47+
| [Python](https://www.python.org/downloads/) | `3.4 or 2.7` |
4848
| [six](https://pypi.python.org/pypi/six) | `1.8` |
4949
| [pyparsing](http://pyparsing.wikispaces.com) | `2.0.3` |
50-
| [pyperclip](https://github.com/asweigart/pyperclip) | `1.5` |
50+
| [pyperclip](https://github.com/asweigart/pyperclip) | `1.6` |
5151

5252
#### Additional prerequisites to run cmd2 unit tests
5353

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Main Features
3232
- Parsing commands with flags
3333
- Unicode character support (*Python 3 only*)
3434
- Good tab-completion of commands, file system paths, and shell commands
35-
- Python 2.7 and 3.3+ support
35+
- Python 2.7 and 3.4+ support
3636
- Linux, macOS and Windows support
3737
- Trivial to provide built-in help for all commands
3838
- 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
4646
pip install -U cmd2
4747
```
4848

49-
cmd2 works with Python 2.7 and Python 3.3+ on Windows, macOS, and Linux. It is pure Python code with
49+
cmd2 works with Python 2.7 and Python 3.4+ on Windows, macOS, and Linux. It is pure Python code with
5050
the only 3rd-party dependencies being on [six](https://pypi.python.org/pypi/six),
5151
[pyparsing](http://pyparsing.wikispaces.com), and [pyperclip](https://github.com/asweigart/pyperclip)
5252
(on Windows, [pyreadline](https://pypi.python.org/pypi/pyreadline) is an additional dependency).

cmd2.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,6 @@
5353
# noinspection PyUnresolvedReferences
5454
from pyperclip import PyperclipException
5555

56-
# On some systems, pyperclip will import gtk for its clipboard functionality.
57-
# The following code is a workaround for gtk interfering with printing from a background
58-
# thread while the CLI thread is blocking in raw_input() in Python 2 on Linux.
59-
try:
60-
# noinspection PyUnresolvedReferences
61-
import gtk
62-
gtk.set_interactive(0)
63-
except ImportError:
64-
pass
65-
6656
# next(it) gets next item of iterator it. This is a replacement for calling it.next() in Python 2 and next(it) in Py3
6757
from six import next
6858

@@ -105,7 +95,18 @@
10595
else:
10696
BROKEN_PIPE_ERROR = IOError
10797

108-
__version__ = '0.7.9a'
98+
# On some systems, pyperclip will import gtk for its clipboard functionality.
99+
# The following code is a workaround for gtk interfering with printing from a background
100+
# thread while the CLI thread is blocking in raw_input() in Python 2 on Linux.
101+
if six.PY2 and sys.platform.startswith('lin'):
102+
try:
103+
# noinspection PyUnresolvedReferences
104+
import gtk
105+
gtk.set_interactive(0)
106+
except ImportError:
107+
pass
108+
109+
__version__ = '0.7.9'
109110

110111
# Pyparsing enablePackrat() can greatly speed up parsing, but problems have been seen in Python 3 in the past
111112
pyparsing.ParserElement.enablePackrat()

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
# The short X.Y version.
6363
version = '0.7'
6464
# The full version, including alpha/beta/rc tags.
65-
release = '0.7.8'
65+
release = '0.7.9'
6666

6767
# The language for content autogenerated by Sphinx. Refer to documentation
6868
# for a list of supported languages.

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Contents:
7272
Compatibility
7373
=============
7474

75-
Tested and working with Python 2.7 and 3.3+.
75+
Tested and working with Python 2.7 and 3.4+.
7676

7777
Indices and tables
7878
==================

docs/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This section covers the basics of how to install, upgrade, and uninstall ``cmd2`
77

88
Installing
99
----------
10-
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
10+
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
1111
install from PyPI_.
1212

1313
.. _pip: https://pypi.python.org/pypi/pip

setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import sys
77
from setuptools import setup
88

9-
VERSION = '0.7.9a'
9+
VERSION = '0.7.9'
1010
DESCRIPTION = "cmd2 - a tool for building interactive command line applications in Python"
1111
LONG_DESCRIPTION = """cmd2 is a tool for building interactive command line applications in Python. Its goal is to make
1212
it quick and easy for developers to build feature-rich and user-friendly interactive command line applications. It
@@ -32,7 +32,7 @@
3232
- Parsing commands with flags
3333
- Unicode character support (*Python 3 only*)
3434
- Good tab-completion of commands, file system paths, and shell commands
35-
- Python 2.7 and 3.3+ support
35+
- Python 2.7 and 3.4+ support
3636
- Linux, macOS and Windows support
3737
- Trivial to provide built-in help for all commands
3838
- Built-in regression testing framework for your applications (transcript-based testing)
@@ -52,7 +52,6 @@
5252
Programming Language :: Python :: 2
5353
Programming Language :: Python :: 2.7
5454
Programming Language :: Python :: 3
55-
Programming Language :: Python :: 3.3
5655
Programming Language :: Python :: 3.4
5756
Programming Language :: Python :: 3.5
5857
Programming Language :: Python :: 3.6

tests/test_cmd2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525

2626
def test_ver():
27-
assert cmd2.__version__ == '0.7.9a'
27+
assert cmd2.__version__ == '0.7.9'
2828

2929

3030
def test_empty_statement(base_app):

0 commit comments

Comments
 (0)