From a6d8b494c3de85eceb33ab57a046fb6955f909fc Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 16 Nov 2018 05:34:00 -0800 Subject: Remove most Python 2 mentions from docs. Exclusions: - `docs/tutorials/wiki/*` was written for Python 2 and supposedly won't run on Python 3. - `docs/api/compat.rst` because it drops some stuff and moves other bits into `pyramid.util` and should be part of another PR. - Ignored a couple of times where `env27` and `Python 2.` appear in command output, but they are inconsequential. --- docs/glossary.rst | 2 +- docs/narr/install.rst | 3 +-- docs/narr/upgrading.rst | 1 - docs/narr/webob.rst | 3 +-- docs/quick_tour.rst | 15 +++++---------- docs/quick_tutorial/index.rst | 3 +-- docs/quick_tutorial/requirements.rst | 9 ++++----- docs/tutorials/wiki2/background.rst | 2 +- docs/tutorials/wiki2/installation.rst | 10 ---------- 9 files changed, 14 insertions(+), 34 deletions(-) diff --git a/docs/glossary.rst b/docs/glossary.rst index f42b298df..e15d28fa5 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -1071,7 +1071,7 @@ Glossary Green Unicorn Aka ``gunicorn``, a fast :term:`WSGI` server that runs on Unix under - Python 2.6+ or Python 3.1+. See https://gunicorn.org/ for detailed + Python 2.6+ or Python 3.4+. See https://gunicorn.org/ for detailed information. predicate factory diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 248b432d3..268ae5f8d 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -21,8 +21,7 @@ the following sections. .. sidebar:: Python Versions - As of this writing, :app:`Pyramid` is tested against Python 2.7, - Python 3.4, Python 3.5, Python 3.6, Python 3.7, and PyPy. + 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. :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 diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst index 12e146cf1..87e4647c3 100644 --- a/docs/narr/upgrading.rst +++ b/docs/narr/upgrading.rst @@ -86,7 +86,6 @@ 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 2.7 Lifespan `_ 2020-01-01. - `Python 3.4 Lifespan `_ 2019-03-16 . - `Python 3.5 Lifespan `_ 2020-09-13 . - `Python 3.6 Lifespan `_ 2021-12-23. diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst index 89dc6e0f1..c9a5a68e1 100644 --- a/docs/narr/webob.rst +++ b/docs/narr/webob.rst @@ -188,8 +188,7 @@ of them. Here are a couple that might be useful: Text (Unicode) ++++++++++++++ -Many of the properties of the request object will be text values (``unicode`` -under Python 2 or ``str`` under Python 3) if the request encoding/charset is +Many of the properties of the request object will be text values (``str`` type) if the request encoding/charset is provided. If it is provided, the values in ``req.POST``, ``req.GET``, ``req.params``, and ``req.cookies`` will contain text. The client *can* indicate the charset with something like ``Content-Type: diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst index 1e2c71cf0..fbafead66 100644 --- a/docs/quick_tour.rst +++ b/docs/quick_tour.rst @@ -15,12 +15,9 @@ If you would prefer to cut and paste the example code in this tour you may brows Installation ============ -Once you have a standard Python environment setup, getting started with Pyramid -is a breeze. Unfortunately "standard" is not so simple in Python. For this -Quick Tour, it means `Python `_, :mod:`python:venv` (or `virtualenv for -Python 2.7 `_), -`pip `_, and `Setuptools -`_. +Once you have a standard Python environment setup, getting started with Pyramid is a breeze. +Unfortunately "standard" is not so simple in Python. +For this Quick Tour, it means `Python `_, :mod:`python:venv`, `pip `_, and `Setuptools `_. To save a little bit of typing and to be certain that we use the modules, scripts, and packages installed in our virtual environment, we'll set an @@ -52,10 +49,8 @@ For Windows: # or for a specific released version c:\\> %VENV%\\Scripts\\pip install "pyramid==\ |release|\ " -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. +As of version 2.0, Pyramid runs on Python 3 only. +For simplicity, the remaining examples will show only Unix commands. .. seealso:: See also: :ref:`Quick Tutorial section on Requirements `, diff --git a/docs/quick_tutorial/index.rst b/docs/quick_tutorial/index.rst index b5b7b3313..44a172067 100644 --- a/docs/quick_tutorial/index.rst +++ b/docs/quick_tutorial/index.rst @@ -4,8 +4,7 @@ Quick Tutorial for Pyramid ========================== -Pyramid is a web framework for Python 2 and 3. This tutorial gives a Python -3/2-compatible, high-level tour of the major features. +Pyramid is a web framework for Python 3. This tutorial gives a Python 3-compatible, high-level tour of the major features. This hands-on tutorial covers "a little about a lot": practical introductions to the most common facilities. Fun, fast-paced, and most certainly not aimed at diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst index a74c07673..f3ffdf153 100644 --- a/docs/quick_tutorial/requirements.rst +++ b/docs/quick_tutorial/requirements.rst @@ -19,12 +19,11 @@ virtual environment.) This *Quick Tutorial* is based on: -* **Python 3.7**. Pyramid fully supports Python 3.4+ and Python 2.7+. This - tutorial uses **Python 3.7** but runs fine under Python 2.7. +* **Python 3.7**. Pyramid fully supports Python 3.4+. + This tutorial uses **Python 3.7**. -* **venv**. We believe in virtual environments. For this tutorial, we use - Python 3's built-in solution :term:`venv`. For Python 2.7, you can install - :term:`virtualenv`. +* **venv**. We believe in virtual environments. + For this tutorial, we use Python 3's built-in solution :term:`venv`. * **pip**. We use :term:`pip` for package management. diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index c14d3cb7d..09315a77d 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -17,6 +17,6 @@ variant, etc.) *or* a Windows system of any kind. .. note:: - This tutorial runs on both Python 2 and 3 without modification. + This tutorial runs on Python 3 without modification. Have fun! diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst index 924927cd4..705979065 100644 --- a/docs/tutorials/wiki2/installation.rst +++ b/docs/tutorials/wiki2/installation.rst @@ -126,16 +126,6 @@ On Unix On Windows ^^^^^^^^^^ -Each version of Python uses different paths, so you will need to adjust the path to the command for your Python version. Recent versions of the Python 3 installer for Windows now install a Python launcher. - -Python 2.7: - -.. code-block:: doscon - - c:\Python27\Scripts\virtualenv %VENV% - -Python 3.7: - .. code-block:: doscon python -m venv %VENV% -- cgit v1.2.3 From 699bd8720dc16ef5dd3321ebbeaa6fa94505b33f Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 16 Nov 2018 05:38:29 -0800 Subject: Remove virtualenv and explicit py3 mentions --- docs/narr/commandline.rst | 8 ++++---- docs/quick_tutorial/requirements.rst | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index b571a7d7b..962193ec3 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -1006,8 +1006,8 @@ top-level directory, your ``setup.py`` file will look something like this: requires = ['pyramid', 'pyramid_debugtoolbar'] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat - 'pytest', # includes virtualenv + 'WebTest >= 1.3.1', + 'pytest', 'pytest-cov', ] @@ -1073,8 +1073,8 @@ The result will be something like: requires = ['pyramid', 'pyramid_debugtoolbar'] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat - 'pytest', # includes virtualenv + 'WebTest >= 1.3.1', + 'pytest', 'pytest-cov', ] diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst index f3ffdf153..2ed9b8b55 100644 --- a/docs/quick_tutorial/requirements.rst +++ b/docs/quick_tutorial/requirements.rst @@ -157,8 +157,7 @@ environment variable. # Windows python -m venv %VENV% -.. seealso:: See also Python 3's :mod:`venv module ` and Python - 2's `virtualenv `_ package. +.. seealso:: See also :mod:`venv module `. Update packaging tools in the virtual environment -- cgit v1.2.3 From 6de8255cb8078dbc8db63c82487cb393ce6b8552 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 05:50:31 -0800 Subject: Remove *_types per b1a257bacc1c4ac2c1401ed02c51d9c6c03685d2 - Remove Python 2 items, and remove explicit mention of Python 3. --- docs/api/compat.rst | 84 +++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 64 deletions(-) diff --git a/docs/api/compat.rst b/docs/api/compat.rst index bb34f38e4..b54b4868a 100644 --- a/docs/api/compat.rst +++ b/docs/api/compat.rst @@ -12,145 +12,101 @@ systems which require compatibility imports. .. autofunction:: ascii_native_ - .. attribute:: binary_type - - Binary type for this platform. For Python 3, it's ``bytes``. For - Python 2, it's ``str``. - .. autofunction:: bytes_ - .. attribute:: class_types - - Sequence of class types for this platform. For Python 3, it's - ``(type,)``. For Python 2, it's ``(type, types.ClassType)``. - .. attribute:: configparser - On Python 2, the ``ConfigParser`` module, on Python 3, the - ``configparser`` module. + The ``configparser`` module. .. function:: escape(v) - On Python 2, the ``cgi.escape`` function, on Python 3, the - ``html.escape`` function. + The ``html.escape`` function. .. function:: exec_(code, globs=None, locs=None) - Exec code in a compatible way on both Python 2 and 3. + Exec code. .. attribute:: im_func - On Python 2, the string value ``im_func``, on Python 3, the string - value ``__func__``. + The string value ``__func__``. .. function:: input_(v) - On Python 2, the ``raw_input`` function, on Python 3, the - ``input`` function. - - .. attribute:: integer_types - - Sequence of integer types for this platform. For Python 3, it's - ``(int,)``. For Python 2, it's ``(int, long)``. + The ``input`` function. .. function:: is_nonstr_iter(v) - Return ``True`` if ``v`` is a non-``str`` iterable on both Python 2 and - Python 3. + Return ``True`` if ``v`` is a non-``str``. .. function:: iteritems_(d) - Return ``d.items()`` on Python 3, ``d.iteritems()`` on Python 2. + Return ``d.items()``. .. function:: itervalues_(d) - Return ``d.values()`` on Python 3, ``d.itervalues()`` on Python 2. + Return ``d.values()``. .. function:: iterkeys_(d) - Return ``d.keys()`` on Python 3, ``d.iterkeys()`` on Python 2. + Return ``d.keys()``. .. attribute:: long - Long type for this platform. For Python 3, it's ``int``. For - Python 2, it's ``long``. + Long type ``int``. .. function:: map_(v) - Return ``list(map(v))`` on Python 3, ``map(v)`` on Python 2. + Return ``list(map(v))``. .. attribute:: pickle ``cPickle`` module if it exists, ``pickle`` module otherwise. - .. attribute:: PY3 - - ``True`` if running on Python 3, ``False`` otherwise. - .. attribute:: PYPY ``True`` if running on PyPy, ``False`` otherwise. .. function:: reraise(tp, value, tb=None) - Reraise an exception in a compatible way on both Python 2 and Python 3, - e.g. ``reraise(*sys.exc_info())``. - - .. attribute:: string_types - - Sequence of string types for this platform. For Python 3, it's - ``(str,)``. For Python 2, it's ``(basestring,)``. + Reraise an exception ``reraise(*sys.exc_info())``. .. attribute:: SimpleCookie - On Python 2, the ``Cookie.SimpleCookie`` class, on Python 3, the ``http.cookies.SimpleCookie`` module. .. autofunction:: text_ - .. attribute:: text_type - - Text type for this platform. For Python 3, it's ``str``. For Python - 2, it's ``unicode``. - .. autofunction:: native_ .. attribute:: urlparse - ``urlparse`` module on Python 2, ``urllib.parse`` module on Python 3. + ``urllib.parse`` .. attribute:: url_quote - ``urllib.quote`` function on Python 2, ``urllib.parse.quote`` function - on Python 3. + ``urllib.parse.quote`` .. attribute:: url_quote_plus - ``urllib.quote_plus`` function on Python 2, ``urllib.parse.quote_plus`` - function on Python 3. + ``urllib.parse.quote_plus`` .. attribute:: url_unquote - ``urllib.unquote`` function on Python 2, ``urllib.parse.unquote`` - function on Python 3. + ``urllib.parse.unquote`` .. attribute:: url_encode - ``urllib.urlencode`` function on Python 2, ``urllib.parse.urlencode`` - function on Python 3. + ``urllib.parse.urlencode`` .. attribute:: url_open - ``urllib2.urlopen`` function on Python 2, ``urllib.request.urlopen`` - function on Python 3. + ``urllib.request.urlopen`` .. function:: url_unquote_text(v, encoding='utf-8', errors='replace') - On Python 2, return ``url_unquote(v).decode(encoding(encoding, errors))``; - on Python 3, return the result of ``urllib.parse.unquote``. + Return the result of ``urllib.parse.unquote``. .. function:: url_unquote_native(v, encoding='utf-8', errors='replace') - On Python 2, return ``native_(url_unquote_text_v, encoding, errors))``; - on Python 3, return the result of ``urllib.parse.unquote``. + Return the result of ``urllib.parse.unquote``. -- cgit v1.2.3 From e6beded7543305b47ef7bc2ba8a0d9ff76ceb5b1 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 05:52:12 -0800 Subject: Remove pickle and exec aliases --- docs/api/compat.rst | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs/api/compat.rst b/docs/api/compat.rst index b54b4868a..c3816f8e9 100644 --- a/docs/api/compat.rst +++ b/docs/api/compat.rst @@ -22,10 +22,6 @@ systems which require compatibility imports. The ``html.escape`` function. - .. function:: exec_(code, globs=None, locs=None) - - Exec code. - .. attribute:: im_func The string value ``__func__``. @@ -58,10 +54,6 @@ systems which require compatibility imports. Return ``list(map(v))``. - .. attribute:: pickle - - ``cPickle`` module if it exists, ``pickle`` module otherwise. - .. attribute:: PYPY ``True`` if running on PyPy, ``False`` otherwise. -- cgit v1.2.3 From 4863dfea9783c11e70f1604415dbc32c12d59ac6 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 05:55:07 -0800 Subject: Remove iter*, configparser, input_, map_ --- docs/api/compat.rst | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/docs/api/compat.rst b/docs/api/compat.rst index c3816f8e9..f647c3108 100644 --- a/docs/api/compat.rst +++ b/docs/api/compat.rst @@ -14,10 +14,6 @@ systems which require compatibility imports. .. autofunction:: bytes_ - .. attribute:: configparser - - The ``configparser`` module. - .. function:: escape(v) The ``html.escape`` function. @@ -26,34 +22,14 @@ systems which require compatibility imports. The string value ``__func__``. - .. function:: input_(v) - - The ``input`` function. - .. function:: is_nonstr_iter(v) Return ``True`` if ``v`` is a non-``str``. - .. function:: iteritems_(d) - - Return ``d.items()``. - - .. function:: itervalues_(d) - - Return ``d.values()``. - - .. function:: iterkeys_(d) - - Return ``d.keys()``. - .. attribute:: long Long type ``int``. - .. function:: map_(v) - - Return ``list(map(v))``. - .. attribute:: PYPY ``True`` if running on PyPy, ``False`` otherwise. -- cgit v1.2.3 From f84582524b625265ad379e41513770aefe7c6dcd Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 05:56:42 -0800 Subject: Remove SimpleCookie and escape shims --- docs/api/compat.rst | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs/api/compat.rst b/docs/api/compat.rst index f647c3108..e25290c37 100644 --- a/docs/api/compat.rst +++ b/docs/api/compat.rst @@ -14,10 +14,6 @@ systems which require compatibility imports. .. autofunction:: bytes_ - .. function:: escape(v) - - The ``html.escape`` function. - .. attribute:: im_func The string value ``__func__``. @@ -38,10 +34,6 @@ systems which require compatibility imports. Reraise an exception ``reraise(*sys.exc_info())``. - .. attribute:: SimpleCookie - - ``http.cookies.SimpleCookie`` module. - .. autofunction:: text_ .. autofunction:: native_ -- cgit v1.2.3 From 5f59fb7db454e47e9845d74ec2b04e581beca574 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 05:57:06 -0800 Subject: Remove reraise --- docs/api/compat.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/api/compat.rst b/docs/api/compat.rst index e25290c37..6f94ea2d4 100644 --- a/docs/api/compat.rst +++ b/docs/api/compat.rst @@ -30,10 +30,6 @@ systems which require compatibility imports. ``True`` if running on PyPy, ``False`` otherwise. - .. function:: reraise(tp, value, tb=None) - - Reraise an exception ``reraise(*sys.exc_info())``. - .. autofunction:: text_ .. autofunction:: native_ -- cgit v1.2.3 From 087dc33696b81235468e80b93ee7eee510d40d8e Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 05:57:30 -0800 Subject: Remove is_nonstr_iter --- docs/api/compat.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/api/compat.rst b/docs/api/compat.rst index 6f94ea2d4..25b81addc 100644 --- a/docs/api/compat.rst +++ b/docs/api/compat.rst @@ -18,10 +18,6 @@ systems which require compatibility imports. The string value ``__func__``. - .. function:: is_nonstr_iter(v) - - Return ``True`` if ``v`` is a non-``str``. - .. attribute:: long Long type ``int``. -- cgit v1.2.3 From c2fabed4dceb33c655a498583841769aa78bebbf Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 06:00:19 -0800 Subject: Remove urllib.parse shims --- docs/api/compat.rst | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/docs/api/compat.rst b/docs/api/compat.rst index 25b81addc..d8a4d0cbb 100644 --- a/docs/api/compat.rst +++ b/docs/api/compat.rst @@ -29,36 +29,3 @@ systems which require compatibility imports. .. autofunction:: text_ .. autofunction:: native_ - - .. attribute:: urlparse - - ``urllib.parse`` - - .. attribute:: url_quote - - ``urllib.parse.quote`` - - .. attribute:: url_quote_plus - - ``urllib.parse.quote_plus`` - - .. attribute:: url_unquote - - ``urllib.parse.unquote`` - - .. attribute:: url_encode - - ``urllib.parse.urlencode`` - - .. attribute:: url_open - - ``urllib.request.urlopen`` - - .. function:: url_unquote_text(v, encoding='utf-8', errors='replace') - - Return the result of ``urllib.parse.unquote``. - - .. function:: url_unquote_native(v, encoding='utf-8', errors='replace') - - Return the result of ``urllib.parse.unquote``. - -- cgit v1.2.3 From 8b7705f27a6ecc47742ec743de0ced7e8a15eb17 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 06:05:42 -0800 Subject: Remove native_, rename ascii_native_ to ascii_ --- docs/api/compat.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/api/compat.rst b/docs/api/compat.rst index d8a4d0cbb..f05bdd51b 100644 --- a/docs/api/compat.rst +++ b/docs/api/compat.rst @@ -10,7 +10,7 @@ systems which require compatibility imports. .. automodule:: pyramid.compat - .. autofunction:: ascii_native_ + .. autofunction:: ascii_ .. autofunction:: bytes_ @@ -27,5 +27,3 @@ systems which require compatibility imports. ``True`` if running on PyPy, ``False`` otherwise. .. autofunction:: text_ - - .. autofunction:: native_ -- cgit v1.2.3 From 1662edc38e145fa820544fb3aad91ab86e3185da Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 06:07:44 -0800 Subject: Remove long type (should have been removed with other type aliases) --- docs/api/compat.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/api/compat.rst b/docs/api/compat.rst index f05bdd51b..d1552e644 100644 --- a/docs/api/compat.rst +++ b/docs/api/compat.rst @@ -18,10 +18,6 @@ systems which require compatibility imports. The string value ``__func__``. - .. attribute:: long - - Long type ``int``. - .. attribute:: PYPY ``True`` if running on PyPy, ``False`` otherwise. -- cgit v1.2.3 From 5ec822694f6d2e14513b3a3b03da2315ff996ce7 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 06:18:26 -0800 Subject: Update Python source files in docs to use `from html import escape`, now that we ripped it out from `pyramid.compat`. --- docs/quick_tour/views/views.py | 4 ++-- docs/tutorials/wiki2/src/authentication/tutorial/views/default.py | 2 +- docs/tutorials/wiki2/src/authorization/tutorial/views/default.py | 2 +- docs/tutorials/wiki2/src/tests/tutorial/views/default.py | 2 +- docs/tutorials/wiki2/src/views/tutorial/views/default.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/quick_tour/views/views.py b/docs/quick_tour/views/views.py index 95a2b60ca..ffbe1d893 100644 --- a/docs/quick_tour/views/views.py +++ b/docs/quick_tour/views/views.py @@ -1,4 +1,4 @@ -from pyramid.compat import escape +from html import escape from pyramid.httpexceptions import HTTPFound from pyramid.response import Response @@ -16,7 +16,7 @@ def home_view(request): def hello_view(request): name = request.params.get('name', 'No Name') body = '

Hi %s, this redirects

' - # pyramid.compat.escape to prevent Cross-Site Scripting (XSS) [CWE 79] + # Python html.escape to prevent Cross-Site Scripting (XSS) [CWE 79] return Response(body % escape(name)) diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/views/default.py b/docs/tutorials/wiki2/src/authentication/tutorial/views/default.py index 8ed90d5b2..2f0210255 100644 --- a/docs/tutorials/wiki2/src/authentication/tutorial/views/default.py +++ b/docs/tutorials/wiki2/src/authentication/tutorial/views/default.py @@ -1,4 +1,4 @@ -from pyramid.compat import escape +from html import escape import re from docutils.core import publish_parts diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/views/default.py b/docs/tutorials/wiki2/src/authorization/tutorial/views/default.py index ad271fb46..ad8491b7b 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/views/default.py +++ b/docs/tutorials/wiki2/src/authorization/tutorial/views/default.py @@ -1,4 +1,4 @@ -from pyramid.compat import escape +from html import escape import re from docutils.core import publish_parts diff --git a/docs/tutorials/wiki2/src/tests/tutorial/views/default.py b/docs/tutorials/wiki2/src/tests/tutorial/views/default.py index ad271fb46..ad8491b7b 100644 --- a/docs/tutorials/wiki2/src/tests/tutorial/views/default.py +++ b/docs/tutorials/wiki2/src/tests/tutorial/views/default.py @@ -1,4 +1,4 @@ -from pyramid.compat import escape +from html import escape import re from docutils.core import publish_parts diff --git a/docs/tutorials/wiki2/src/views/tutorial/views/default.py b/docs/tutorials/wiki2/src/views/tutorial/views/default.py index a866af1de..5e28b64fd 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/views/default.py +++ b/docs/tutorials/wiki2/src/views/tutorial/views/default.py @@ -1,4 +1,4 @@ -from pyramid.compat import escape +from html import escape import re from docutils.core import publish_parts -- cgit v1.2.3 From c5e93f9f87c6d98be8db51fc3711ea83c881899a Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 06:30:45 -0800 Subject: Remove mention of py3 compat --- docs/quick_tour/logging/setup.py | 2 +- docs/quick_tour/package/setup.py | 2 +- docs/quick_tour/sessions/setup.py | 2 +- docs/quick_tour/sqla_demo/setup.py | 2 +- docs/quick_tutorial/cookiecutters/setup.py | 2 +- docs/tutorials/wiki/src/authorization/setup.py | 2 +- docs/tutorials/wiki/src/basiclayout/setup.py | 2 +- docs/tutorials/wiki/src/installation/setup.py | 2 +- docs/tutorials/wiki/src/models/setup.py | 2 +- docs/tutorials/wiki/src/tests/setup.py | 2 +- docs/tutorials/wiki/src/views/setup.py | 2 +- docs/tutorials/wiki2/src/authentication/setup.py | 2 +- docs/tutorials/wiki2/src/authorization/setup.py | 2 +- docs/tutorials/wiki2/src/basiclayout/setup.py | 2 +- docs/tutorials/wiki2/src/installation/setup.py | 2 +- docs/tutorials/wiki2/src/models/setup.py | 2 +- docs/tutorials/wiki2/src/tests/setup.py | 2 +- docs/tutorials/wiki2/src/views/setup.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/quick_tour/logging/setup.py b/docs/quick_tour/logging/setup.py index 27b025384..47f21a9dc 100644 --- a/docs/quick_tour/logging/setup.py +++ b/docs/quick_tour/logging/setup.py @@ -17,7 +17,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/quick_tour/package/setup.py b/docs/quick_tour/package/setup.py index 27b025384..47f21a9dc 100644 --- a/docs/quick_tour/package/setup.py +++ b/docs/quick_tour/package/setup.py @@ -17,7 +17,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/quick_tour/sessions/setup.py b/docs/quick_tour/sessions/setup.py index 27b025384..47f21a9dc 100644 --- a/docs/quick_tour/sessions/setup.py +++ b/docs/quick_tour/sessions/setup.py @@ -17,7 +17,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/quick_tour/sqla_demo/setup.py b/docs/quick_tour/sqla_demo/setup.py index 76cd518ca..71ebfab3a 100644 --- a/docs/quick_tour/sqla_demo/setup.py +++ b/docs/quick_tour/sqla_demo/setup.py @@ -23,7 +23,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/quick_tutorial/cookiecutters/setup.py b/docs/quick_tutorial/cookiecutters/setup.py index 9482e7c32..404e7d228 100644 --- a/docs/quick_tutorial/cookiecutters/setup.py +++ b/docs/quick_tutorial/cookiecutters/setup.py @@ -17,7 +17,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py index 7011387f6..4a1224664 100644 --- a/docs/tutorials/wiki/src/authorization/setup.py +++ b/docs/tutorials/wiki/src/authorization/setup.py @@ -24,7 +24,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py index e05e279e2..e266a546b 100644 --- a/docs/tutorials/wiki/src/basiclayout/setup.py +++ b/docs/tutorials/wiki/src/basiclayout/setup.py @@ -22,7 +22,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/installation/setup.py b/docs/tutorials/wiki/src/installation/setup.py index e05e279e2..e266a546b 100644 --- a/docs/tutorials/wiki/src/installation/setup.py +++ b/docs/tutorials/wiki/src/installation/setup.py @@ -22,7 +22,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py index e05e279e2..e266a546b 100644 --- a/docs/tutorials/wiki/src/models/setup.py +++ b/docs/tutorials/wiki/src/models/setup.py @@ -22,7 +22,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py index 7011387f6..4a1224664 100644 --- a/docs/tutorials/wiki/src/tests/setup.py +++ b/docs/tutorials/wiki/src/tests/setup.py @@ -24,7 +24,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py index a11ae6c8f..2d120224f 100644 --- a/docs/tutorials/wiki/src/views/setup.py +++ b/docs/tutorials/wiki/src/views/setup.py @@ -23,7 +23,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/authentication/setup.py b/docs/tutorials/wiki2/src/authentication/setup.py index e2a30c0e7..18dc1b617 100644 --- a/docs/tutorials/wiki2/src/authentication/setup.py +++ b/docs/tutorials/wiki2/src/authentication/setup.py @@ -25,7 +25,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py index e2a30c0e7..18dc1b617 100644 --- a/docs/tutorials/wiki2/src/authorization/setup.py +++ b/docs/tutorials/wiki2/src/authorization/setup.py @@ -25,7 +25,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py index 11725dd51..135e51ce8 100644 --- a/docs/tutorials/wiki2/src/basiclayout/setup.py +++ b/docs/tutorials/wiki2/src/basiclayout/setup.py @@ -23,7 +23,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/installation/setup.py b/docs/tutorials/wiki2/src/installation/setup.py index 11725dd51..135e51ce8 100644 --- a/docs/tutorials/wiki2/src/installation/setup.py +++ b/docs/tutorials/wiki2/src/installation/setup.py @@ -23,7 +23,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py index 09e3126ea..556e1837d 100644 --- a/docs/tutorials/wiki2/src/models/setup.py +++ b/docs/tutorials/wiki2/src/models/setup.py @@ -24,7 +24,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py index e2a30c0e7..18dc1b617 100644 --- a/docs/tutorials/wiki2/src/tests/setup.py +++ b/docs/tutorials/wiki2/src/tests/setup.py @@ -25,7 +25,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py index e2a30c0e7..18dc1b617 100644 --- a/docs/tutorials/wiki2/src/views/setup.py +++ b/docs/tutorials/wiki2/src/views/setup.py @@ -25,7 +25,7 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', # py3 compat + 'WebTest >= 1.3.1', 'pytest>=3.7.4', 'pytest-cov', ] -- cgit v1.2.3 From ae9453732bcbd4a9812e6cd9232bba6d469a9953 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 17 Nov 2018 15:49:12 -0800 Subject: Remove explicit mention of Python 3 --- docs/quick_tutorial/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quick_tutorial/index.rst b/docs/quick_tutorial/index.rst index 44a172067..d727502e9 100644 --- a/docs/quick_tutorial/index.rst +++ b/docs/quick_tutorial/index.rst @@ -4,7 +4,7 @@ Quick Tutorial for Pyramid ========================== -Pyramid is a web framework for Python 3. This tutorial gives a Python 3-compatible, high-level tour of the major features. +This tutorial gives a high-level tour of the major features. This hands-on tutorial covers "a little about a lot": practical introductions to the most common facilities. Fun, fast-paced, and most certainly not aimed at -- cgit v1.2.3 From 54fba396ce913c9731f920447d680f1480d8517e Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 18 Nov 2018 05:15:42 -0800 Subject: Unpin webtest and pytest --- docs/quick_tour/logging/setup.py | 4 ++-- docs/quick_tour/package/setup.py | 4 ++-- docs/quick_tour/sessions/setup.py | 4 ++-- docs/quick_tour/sqla_demo/setup.py | 4 ++-- docs/quick_tutorial/cookiecutters/setup.py | 4 ++-- docs/tutorials/wiki/src/authorization/setup.py | 4 ++-- docs/tutorials/wiki/src/basiclayout/setup.py | 4 ++-- docs/tutorials/wiki/src/installation/setup.py | 4 ++-- docs/tutorials/wiki/src/models/setup.py | 4 ++-- docs/tutorials/wiki/src/tests/setup.py | 4 ++-- docs/tutorials/wiki/src/views/setup.py | 4 ++-- docs/tutorials/wiki2/src/authentication/setup.py | 4 ++-- docs/tutorials/wiki2/src/authorization/setup.py | 4 ++-- docs/tutorials/wiki2/src/basiclayout/setup.py | 4 ++-- docs/tutorials/wiki2/src/installation/setup.py | 4 ++-- docs/tutorials/wiki2/src/models/setup.py | 4 ++-- docs/tutorials/wiki2/src/tests/setup.py | 4 ++-- docs/tutorials/wiki2/src/views/setup.py | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/quick_tour/logging/setup.py b/docs/quick_tour/logging/setup.py index 47f21a9dc..e9c15db04 100644 --- a/docs/quick_tour/logging/setup.py +++ b/docs/quick_tour/logging/setup.py @@ -17,8 +17,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/quick_tour/package/setup.py b/docs/quick_tour/package/setup.py index 47f21a9dc..e9c15db04 100644 --- a/docs/quick_tour/package/setup.py +++ b/docs/quick_tour/package/setup.py @@ -17,8 +17,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/quick_tour/sessions/setup.py b/docs/quick_tour/sessions/setup.py index 47f21a9dc..e9c15db04 100644 --- a/docs/quick_tour/sessions/setup.py +++ b/docs/quick_tour/sessions/setup.py @@ -17,8 +17,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/quick_tour/sqla_demo/setup.py b/docs/quick_tour/sqla_demo/setup.py index 71ebfab3a..28a8e0815 100644 --- a/docs/quick_tour/sqla_demo/setup.py +++ b/docs/quick_tour/sqla_demo/setup.py @@ -23,8 +23,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/quick_tutorial/cookiecutters/setup.py b/docs/quick_tutorial/cookiecutters/setup.py index 404e7d228..d5d3d018b 100644 --- a/docs/quick_tutorial/cookiecutters/setup.py +++ b/docs/quick_tutorial/cookiecutters/setup.py @@ -17,8 +17,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py index 4a1224664..7b405745e 100644 --- a/docs/tutorials/wiki/src/authorization/setup.py +++ b/docs/tutorials/wiki/src/authorization/setup.py @@ -24,8 +24,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py index e266a546b..a4f143d24 100644 --- a/docs/tutorials/wiki/src/basiclayout/setup.py +++ b/docs/tutorials/wiki/src/basiclayout/setup.py @@ -22,8 +22,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/installation/setup.py b/docs/tutorials/wiki/src/installation/setup.py index e266a546b..a4f143d24 100644 --- a/docs/tutorials/wiki/src/installation/setup.py +++ b/docs/tutorials/wiki/src/installation/setup.py @@ -22,8 +22,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py index e266a546b..a4f143d24 100644 --- a/docs/tutorials/wiki/src/models/setup.py +++ b/docs/tutorials/wiki/src/models/setup.py @@ -22,8 +22,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py index 4a1224664..7b405745e 100644 --- a/docs/tutorials/wiki/src/tests/setup.py +++ b/docs/tutorials/wiki/src/tests/setup.py @@ -24,8 +24,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py index 2d120224f..3c19db7b9 100644 --- a/docs/tutorials/wiki/src/views/setup.py +++ b/docs/tutorials/wiki/src/views/setup.py @@ -23,8 +23,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/authentication/setup.py b/docs/tutorials/wiki2/src/authentication/setup.py index 18dc1b617..f71998afc 100644 --- a/docs/tutorials/wiki2/src/authentication/setup.py +++ b/docs/tutorials/wiki2/src/authentication/setup.py @@ -25,8 +25,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py index 18dc1b617..f71998afc 100644 --- a/docs/tutorials/wiki2/src/authorization/setup.py +++ b/docs/tutorials/wiki2/src/authorization/setup.py @@ -25,8 +25,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py index 135e51ce8..746012a74 100644 --- a/docs/tutorials/wiki2/src/basiclayout/setup.py +++ b/docs/tutorials/wiki2/src/basiclayout/setup.py @@ -23,8 +23,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/installation/setup.py b/docs/tutorials/wiki2/src/installation/setup.py index 135e51ce8..746012a74 100644 --- a/docs/tutorials/wiki2/src/installation/setup.py +++ b/docs/tutorials/wiki2/src/installation/setup.py @@ -23,8 +23,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py index 556e1837d..b9dc9d93f 100644 --- a/docs/tutorials/wiki2/src/models/setup.py +++ b/docs/tutorials/wiki2/src/models/setup.py @@ -24,8 +24,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py index 18dc1b617..f71998afc 100644 --- a/docs/tutorials/wiki2/src/tests/setup.py +++ b/docs/tutorials/wiki2/src/tests/setup.py @@ -25,8 +25,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py index 18dc1b617..f71998afc 100644 --- a/docs/tutorials/wiki2/src/views/setup.py +++ b/docs/tutorials/wiki2/src/views/setup.py @@ -25,8 +25,8 @@ requires = [ ] tests_require = [ - 'WebTest >= 1.3.1', - 'pytest>=3.7.4', + 'WebTest', + 'pytest', 'pytest-cov', ] -- cgit v1.2.3 From a05a4663f57b9acac876359b1d37b20514457550 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 18 Nov 2018 05:20:33 -0800 Subject: Add comments to setup.py docs_extras --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b63f4c182..3176442e1 100644 --- a/setup.py +++ b/setup.py @@ -44,9 +44,9 @@ tests_require = [ docs_extras = [ - 'Sphinx >= 1.8.1', + 'Sphinx >= 1.8.1', # Unicode characters in tree diagrams 'docutils', - 'pylons-sphinx-themes >= 1.0.8', + 'pylons-sphinx-themes >= 1.0.8', # Ethical Ads 'pylons_sphinx_latesturl', 'repoze.sphinx.autointerface', 'sphinxcontrib-autoprogram', -- cgit v1.2.3 From fe1740acba6a9bfe5ac3aed41a9a264a9fd30814 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 18 Nov 2018 05:22:54 -0800 Subject: Remove `docs/api/compat.rst`. The remaining items were moved into `pyramid.util`, but we don't want to document anything in that module. --- docs/api/compat.rst | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 docs/api/compat.rst diff --git a/docs/api/compat.rst b/docs/api/compat.rst deleted file mode 100644 index d1552e644..000000000 --- a/docs/api/compat.rst +++ /dev/null @@ -1,25 +0,0 @@ -.. _compat_module: - -:mod:`pyramid.compat` ----------------------- - -The ``pyramid.compat`` module provides platform and version compatibility for -Pyramid and its add-ons across Python platform and version differences. APIs -will be removed from this module over time as Pyramid ceases to support -systems which require compatibility imports. - -.. automodule:: pyramid.compat - - .. autofunction:: ascii_ - - .. autofunction:: bytes_ - - .. attribute:: im_func - - The string value ``__func__``. - - .. attribute:: PYPY - - ``True`` if running on PyPy, ``False`` otherwise. - - .. autofunction:: text_ -- cgit v1.2.3 From 82c2307d738be3b31aa05814e6b3fcbb97f41d18 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 18 Nov 2018 05:29:39 -0800 Subject: Remove Python 2 and explicit mention of Python 3 --- HACKING.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/HACKING.txt b/HACKING.txt index acd65e4fd..901eb8518 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -34,10 +34,10 @@ 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.4, 3.5, - 3.6, and 3.7 on both UNIX and Windows. +- 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 on the latest version of PyPy. +- The feature must work on the latest version of PyPy3. - The feature must not depend on any particular persistence layer (filesystem, SQL, etc). @@ -65,10 +65,9 @@ Running Tests $ tox -e py37 - This command will run tests on the latest versions of Python 2 and 3 with - coverage totaled for both versions. + This command will run tests on the latest version of Python 3 with coverage. - $ tox -e py2-cover,py3-cover,coverage + $ tox -e py3-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 @@ -105,7 +104,7 @@ Test Coverage ------------- - The codebase *must* have 100% test statement coverage after each commit. You - can test coverage via `tox -epy2-cover,py3-cover,coverage`. + can test coverage via `tox -epy3-cover,coverage`. Documentation Coverage and Building HTML Documentation -- cgit v1.2.3 From 847d1835a5b76da4925ee3248e69148cc4235df9 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 18 Nov 2018 05:32:29 -0800 Subject: Remove scaffolds testing instructions --- RELEASING.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/RELEASING.txt b/RELEASING.txt index 94726f9f3..73e79d057 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -33,11 +33,6 @@ Prepare new release branch - Run tests on Windows if feasible. -- Make sure all scaffold tests pass (CPython 2.7, 3.4, 3.5, 3.6, and 3.7, and - PyPy on UNIX; this doesn't work on Windows): - - $ tox -e{py27,py34,py35,py36,py37,pypy}-scaffolds - - For each ``pyramid-cookiecutter-*``, make a new branch off "master" with the same name to align with the new Pyramid release branch name. -- cgit v1.2.3