From d48884477c515113b935375a9f8ff204e2ca4323 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sat, 19 May 2018 13:24:09 +0200
Subject: [PATCH] backport for #3182
---
docs/quick_tutorial/authorization/setup.py | 6 +-
docs/quick_tutorial/logging/setup.py | 4 +-
docs/quick_tutorial/authentication/setup.py | 6 +-
docs/quick_tutorial/json/setup.py | 4 +-
docs/quick_tutorial/view_classes/setup.py | 4 +-
docs/quick_tutorial/sessions/setup.py | 4 +-
docs/quick_tutorial/more_view_classes/setup.py | 4 +-
docs/quick_tutorial/forms.rst | 2
docs/quick_tutorial/routing/setup.py | 4 +-
docs/quick_tutorial/cookiecutters/setup.py | 2
docs/quick_tutorial/databases/setup.py | 12 +++---
docs/quick_tutorial/static_assets/setup.py | 4 +-
docs/quick_tutorial/templating/setup.py | 2
docs/quick_tutorial/forms/setup.py | 6 +-
docs/quick_tutorial/retail_forms/setup.py | 6 +-
docs/quick_tutorial/authentication.rst | 4 +-
16 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/docs/quick_tutorial/authentication.rst b/docs/quick_tutorial/authentication.rst
index 684cce6..015aa2b 100644
--- a/docs/quick_tutorial/authentication.rst
+++ b/docs/quick_tutorial/authentication.rst
@@ -39,7 +39,7 @@
.. literalinclude:: authentication/setup.py
:language: python
- :emphasize-lines: 7
+ :emphasize-lines: 4
:linenos:
#. We can now install our project in development mode:
@@ -94,7 +94,7 @@
#. Click the "Log In" link.
-#. Submit the login form with the username ``editor`` and the password
+#. Submit the login form with the username ``editor`` and the password
``editor``.
#. Note that the "Log In" link has changed to "Logout".
diff --git a/docs/quick_tutorial/authentication/setup.py b/docs/quick_tutorial/authentication/setup.py
index 808a6f9..a5117af 100644
--- a/docs/quick_tutorial/authentication/setup.py
+++ b/docs/quick_tutorial/authentication/setup.py
@@ -1,10 +1,10 @@
from setuptools import setup
requires = [
+ 'bcrypt',
'pyramid',
- 'waitress',
'pyramid_chameleon',
- 'bcrypt'
+ 'waitress',
]
setup(name='tutorial',
@@ -13,4 +13,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/authorization/setup.py b/docs/quick_tutorial/authorization/setup.py
index 808a6f9..a5117af 100644
--- a/docs/quick_tutorial/authorization/setup.py
+++ b/docs/quick_tutorial/authorization/setup.py
@@ -1,10 +1,10 @@
from setuptools import setup
requires = [
+ 'bcrypt',
'pyramid',
- 'waitress',
'pyramid_chameleon',
- 'bcrypt'
+ 'waitress',
]
setup(name='tutorial',
@@ -13,4 +13,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/cookiecutters/setup.py b/docs/quick_tutorial/cookiecutters/setup.py
index e47cdf8..0d1b3f7 100644
--- a/docs/quick_tutorial/cookiecutters/setup.py
+++ b/docs/quick_tutorial/cookiecutters/setup.py
@@ -10,8 +10,8 @@
requires = [
'pyramid',
- 'pyramid_jinja2',
'pyramid_debugtoolbar',
+ 'pyramid_jinja2',
'waitress',
]
diff --git a/docs/quick_tutorial/databases/setup.py b/docs/quick_tutorial/databases/setup.py
index 66045fd..13d1d66 100644
--- a/docs/quick_tutorial/databases/setup.py
+++ b/docs/quick_tutorial/databases/setup.py
@@ -1,13 +1,13 @@
from setuptools import setup
requires = [
- 'pyramid',
- 'waitress',
- 'pyramid_chameleon',
'deform',
- 'sqlalchemy',
+ 'pyramid',
+ 'pyramid_chameleon',
'pyramid_tm',
- 'zope.sqlalchemy'
+ 'sqlalchemy',
+ 'waitress',
+ 'zope.sqlalchemy',
]
setup(name='tutorial',
@@ -18,4 +18,4 @@
[console_scripts]
initialize_tutorial_db = tutorial.initialize_db:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/forms.rst b/docs/quick_tutorial/forms.rst
index 3c865ad..45eb05a 100644
--- a/docs/quick_tutorial/forms.rst
+++ b/docs/quick_tutorial/forms.rst
@@ -41,7 +41,7 @@
pulls in Colander as a dependency:
.. literalinclude:: forms/setup.py
- :emphasize-lines: 7
+ :emphasize-lines: 4
:linenos:
#. We can now install our project in development mode:
diff --git a/docs/quick_tutorial/forms/setup.py b/docs/quick_tutorial/forms/setup.py
index 5293ef7..968889e 100644
--- a/docs/quick_tutorial/forms/setup.py
+++ b/docs/quick_tutorial/forms/setup.py
@@ -1,10 +1,10 @@
from setuptools import setup
requires = [
+ 'deform',
'pyramid',
- 'waitress',
'pyramid_chameleon',
- 'deform'
+ 'waitress',
]
setup(name='tutorial',
@@ -13,4 +13,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/json/setup.py b/docs/quick_tutorial/json/setup.py
index aefa352..7446123 100644
--- a/docs/quick_tutorial/json/setup.py
+++ b/docs/quick_tutorial/json/setup.py
@@ -2,8 +2,8 @@
requires = [
'pyramid',
+ 'pyramid_chameleon',
'waitress',
- 'pyramid_chameleon'
]
setup(name='tutorial',
@@ -12,4 +12,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/logging/setup.py b/docs/quick_tutorial/logging/setup.py
index aefa352..7446123 100644
--- a/docs/quick_tutorial/logging/setup.py
+++ b/docs/quick_tutorial/logging/setup.py
@@ -2,8 +2,8 @@
requires = [
'pyramid',
+ 'pyramid_chameleon',
'waitress',
- 'pyramid_chameleon'
]
setup(name='tutorial',
@@ -12,4 +12,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/more_view_classes/setup.py b/docs/quick_tutorial/more_view_classes/setup.py
index aefa352..7446123 100644
--- a/docs/quick_tutorial/more_view_classes/setup.py
+++ b/docs/quick_tutorial/more_view_classes/setup.py
@@ -2,8 +2,8 @@
requires = [
'pyramid',
+ 'pyramid_chameleon',
'waitress',
- 'pyramid_chameleon'
]
setup(name='tutorial',
@@ -12,4 +12,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/retail_forms/setup.py b/docs/quick_tutorial/retail_forms/setup.py
index 5293ef7..968889e 100644
--- a/docs/quick_tutorial/retail_forms/setup.py
+++ b/docs/quick_tutorial/retail_forms/setup.py
@@ -1,10 +1,10 @@
from setuptools import setup
requires = [
+ 'deform',
'pyramid',
- 'waitress',
'pyramid_chameleon',
- 'deform'
+ 'waitress',
]
setup(name='tutorial',
@@ -13,4 +13,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/routing/setup.py b/docs/quick_tutorial/routing/setup.py
index aefa352..7446123 100644
--- a/docs/quick_tutorial/routing/setup.py
+++ b/docs/quick_tutorial/routing/setup.py
@@ -2,8 +2,8 @@
requires = [
'pyramid',
+ 'pyramid_chameleon',
'waitress',
- 'pyramid_chameleon'
]
setup(name='tutorial',
@@ -12,4 +12,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/sessions/setup.py b/docs/quick_tutorial/sessions/setup.py
index aefa352..7446123 100644
--- a/docs/quick_tutorial/sessions/setup.py
+++ b/docs/quick_tutorial/sessions/setup.py
@@ -2,8 +2,8 @@
requires = [
'pyramid',
+ 'pyramid_chameleon',
'waitress',
- 'pyramid_chameleon'
]
setup(name='tutorial',
@@ -12,4 +12,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/static_assets/setup.py b/docs/quick_tutorial/static_assets/setup.py
index aefa352..7446123 100644
--- a/docs/quick_tutorial/static_assets/setup.py
+++ b/docs/quick_tutorial/static_assets/setup.py
@@ -2,8 +2,8 @@
requires = [
'pyramid',
+ 'pyramid_chameleon',
'waitress',
- 'pyramid_chameleon'
]
setup(name='tutorial',
@@ -12,4 +12,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
diff --git a/docs/quick_tutorial/templating/setup.py b/docs/quick_tutorial/templating/setup.py
index d191017..7446123 100644
--- a/docs/quick_tutorial/templating/setup.py
+++ b/docs/quick_tutorial/templating/setup.py
@@ -2,8 +2,8 @@
requires = [
'pyramid',
- 'waitress',
'pyramid_chameleon',
+ 'waitress',
]
setup(name='tutorial',
diff --git a/docs/quick_tutorial/view_classes/setup.py b/docs/quick_tutorial/view_classes/setup.py
index aefa352..7446123 100644
--- a/docs/quick_tutorial/view_classes/setup.py
+++ b/docs/quick_tutorial/view_classes/setup.py
@@ -2,8 +2,8 @@
requires = [
'pyramid',
+ 'pyramid_chameleon',
'waitress',
- 'pyramid_chameleon'
]
setup(name='tutorial',
@@ -12,4 +12,4 @@
[paste.app_factory]
main = tutorial:main
""",
-)
\ No newline at end of file
+)
--
Gitblit v1.9.3