Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set the minimum supported version at py35 #3547

Merged
merged 6 commits into from
Dec 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ sudo: false

matrix:
include:
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
Expand All @@ -14,20 +12,18 @@ matrix:
env: TOXENV=pypy3
- python: 3.6
env: TOXENV=py36-cover,coverage
- python: 3.5
- python: 3.6
env: TOXENV=docs
- python: 3.6
env: TOXENV=lint
- python: 3.7
env: TOXENV=py37
dist: xenial
sudo: true
- python: 3.8-dev
- python: 3.8
env: TOXENV=py38
dist: xenial
sudo: true
allow_failures:
- env: TOXENV=py38

install:
- travis_retry pip install tox
Expand Down
5 changes: 2 additions & 3 deletions HACKING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ 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: 3.4, 3.5, 3.6,
and 3.7 on both UNIX and Windows.
- The feature must work fully on the following CPython versions: 3.5, 3.6, 3.7, and 3.8 on both UNIX and Windows.

- The feature must work on the latest version of PyPy3.

Expand Down Expand Up @@ -67,7 +66,7 @@ Running Tests

This command will run tests on the latest version of Python 3 with coverage.

$ tox -e py3-cover,coverage
$ tox -e py36-cover,coverage

- To run individual tests (i.e., during development), you can use `nosetests`
syntax as follows, where `$VENV` is an environment variable set to the path
Expand Down
12 changes: 6 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
environment:
matrix:
- PYTHON: "C:\\Python37"
TOXENV: "py37"
- PYTHON: "C:\\Python36"
TOXENV: "py36"
- PYTHON: "C:\\Python35"
TOXENV: "py35"
- PYTHON: "C:\\Python34"
TOXENV: "py34"
- PYTHON: "C:\\Python36"
TOXENV: "py36"
- PYTHON: "C:\\Python37"
TOXENV: "py37"
- PYTHON: "C:\\Python38"
TOXENV: "py38"

cache:
- '%LOCALAPPDATA%\pip\Cache'
Expand Down
6 changes: 3 additions & 3 deletions docs/narr/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Installing :app:`Pyramid`

.. note::

This installation guide emphasizes the use of Python 3.4 and greater for
This installation guide emphasizes the use of Python 3.5 and greater for
simplicity.


Expand All @@ -15,13 +15,13 @@ Installing :app:`Pyramid`
Before You Install Pyramid
--------------------------

Install Python version 3.4 or greater for your operating system, and satisfy
Install Python version 3.5 or greater for your operating system, and satisfy
the :ref:`requirements-for-installing-packages`, as described in
the following sections.

.. sidebar:: Python Versions

As of this writing, :app:`Pyramid` is tested against Python 3.4, Python 3.5, Python 3.6, Python 3.7, Python 3.8 (with allowed failures), and PyPy3.
As of this writing, :app:`Pyramid` is tested against Python 3.5, 3.6, Python 3.7, Python 3.8, and PyPy3.

:app:`Pyramid` is known to run on all popular Unix-like systems such as Linux,
macOS, and FreeBSD, as well as on Windows platforms. It is also known to
Expand Down
2 changes: 1 addition & 1 deletion docs/narr/logging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ you to send messages to :mod:`Python standard library logging package
:term:`PasteDeploy` ``development.ini`` and ``production.ini`` files created
when you use our cookiecutter include a basic configuration for the Python
:mod:`logging` package.
These ``.ini`` file sections are passed to the `logging module's config file configuration engine <https://docs.python.org/3.7/howto/logging.html#configuring-logging>`_.
These ``.ini`` file sections are passed to the `logging module's config file configuration engine <https://docs.python.org/3/howto/logging.html#configuring-logging>`_.

PasteDeploy ``.ini`` files use the Python standard library :mod:`ConfigParser
format <ConfigParser>`. This is the same format used as the Python
Expand Down
6 changes: 3 additions & 3 deletions docs/narr/upgrading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ At the time of a Pyramid version release, each supports all versions of Python
through the end of their lifespans. The end-of-life for a given version of
Python is when security updates are no longer released.

- `Python 3.4 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2019-03-16 .
- `Python 3.5 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2020-09-13 .
- `Python 3.5 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2020-09-13.
- `Python 3.6 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2021-12-23.
- `Python 3.7 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2023-06-27 .
- `Python 3.7 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2023-06-27.
- `Python 3.8 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2024-10-??.

To determine the Python support for a specific release of Pyramid, view its
``tox.ini`` file at the root of the repository's version.
Expand Down
4 changes: 2 additions & 2 deletions docs/quick_tutorial/requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ virtual environment.)

This *Quick Tutorial* is based on:

* **Python 3.7**. Pyramid fully supports Python 3.4+.
This tutorial uses **Python 3.7**.
* **Python 3.8**. Pyramid fully supports Python 3.5+.
This tutorial uses **Python 3.8**.

* **venv**. We believe in virtual environments.
For this tutorial, we use Python 3's built-in solution :term:`venv`.
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/modwsgi/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ specific path information for commands and files.
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
WSGIDaemonProcess pyramid user=chrism group=staff threads=4 \
python-path=/Users/chrism/myproject/env/lib/python3.5/site-packages
python-path=/Users/chrism/myproject/env/lib/python3.8/site-packages
WSGIScriptAlias /myapp /Users/chrism/myproject/pyramid.wsgi

<Directory /Users/chrism/myproject>
Expand Down
2 changes: 0 additions & 2 deletions docs/tutorials/wiki/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ On Unix
On Windows
^^^^^^^^^^

Python 3.7:

.. code-block:: doscon

python -m venv %VENV%
Expand Down
3 changes: 0 additions & 3 deletions docs/tutorials/wiki/tests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,3 @@ The expected result should look like the following:

.........................
25 passed in 6.87 seconds

If you use Python 3.7, you may see deprecation warnings from the docutils 0.14 package.
You can apply a [patch](https://sourceforge.net/p/docutils/patches/144/) to fix the issue, or ignore it and wait for the next release of docutils.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ def readfile(name):
"Intended Audience :: Developers",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Framework :: Pyramid",
Expand All @@ -94,7 +94,7 @@ def readfile(name):
package_dir={'': 'src'},
include_package_data=True,
zip_safe=False,
python_requires='>=3.4',
python_requires='>=3.5',
install_requires=install_requires,
extras_require={'testing': testing_extras, 'docs': docs_extras},
tests_require=tests_require,
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
lint,
py34,py35,py36,py37,pypy3,
py35,py36,py37,py38,pypy3,
docs,py36-cover,coverage,

[testenv]
Expand Down