diff options
| author | Michael Merickel <mmerickel@users.noreply.github.com> | 2016-09-01 16:24:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 16:24:26 -0500 |
| commit | bcde3d6caded35d8d64e6e7acf3bf5b2a8501260 (patch) | |
| tree | 8e5e0576c2a7ab325646e268def6f0961f6de753 | |
| parent | a5c8100d780155643063742c716ac8d2f54e2e45 (diff) | |
| parent | bdd5440023f016f3b6597c66dc26cc30e22960eb (diff) | |
| download | pyramid-bcde3d6caded35d8d64e6e7acf3bf5b2a8501260.tar.gz pyramid-bcde3d6caded35d8d64e6e7acf3bf5b2a8501260.tar.bz2 pyramid-bcde3d6caded35d8d64e6e7acf3bf5b2a8501260.zip | |
Merge pull request #3 from stevepiercy/mmerickel-drop-py33
clean up HACKING and RELEASING for 1.8
| -rw-r--r-- | HACKING.txt | 6 | ||||
| -rw-r--r-- | RELEASING.txt | 4 | ||||
| -rw-r--r-- | docs/quick_tour.rst | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/HACKING.txt b/HACKING.txt index 86ba5d0ca..4b237b56c 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -124,8 +124,8 @@ In order to add a feature to Pyramid: - The feature must be documented in both the API and narrative documentation (in ``docs/``). -- The feature must work fully on the following CPython versions: 2.7, 3.2, - 3.4, and 3.5 on both UNIX and Windows. +- The feature must work fully on the following CPython versions: 2.7, 3.4, + and 3.5 on both UNIX and Windows. - The feature must work on the latest version of PyPy. @@ -199,7 +199,7 @@ Running Tests Alternately:: - $ tox -e{py26,py27,py32,py33,py34,py35,pypy,pypy3}-scaffolds, + $ tox -e{py27,py34,py35,pypy}-scaffolds, Test Coverage ------------- diff --git a/RELEASING.txt b/RELEASING.txt index 326dea993..4690fbd37 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -33,8 +33,8 @@ Prepare new release branch - Run tests on Windows if feasible. -- Make sure all scaffold tests pass (Py 2.7, 3.3, 3.4, 3.5, and pypy on UNIX; - this doesn't work on Windows): +- Make sure all scaffold tests pass (CPython 2.7, 3.4, and 3.5, and PyPy on + UNIX; this doesn't work on Windows): $ ./scaffoldtests.sh diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst index 88cd69400..b2dec77e9 100644 --- a/docs/quick_tour.rst +++ b/docs/quick_tour.rst @@ -52,7 +52,7 @@ For Windows: # or for a specific released version c:\\> %VENV%\\Scripts\\pip install "pyramid==\ |release|\ " -Of course Pyramid runs fine on Python 2.6+, as do the examples in this *Quick +Of course Pyramid runs fine on Python 2.7+, as do the examples in this *Quick Tour*. We're showing Python 3 for simplicity. (Pyramid had production support for Python 3 in October 2011.) Also for simplicity, the remaining examples will show only UNIX commands. |