summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst3
-rw-r--r--setup.py33
2 files changed, 18 insertions, 18 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 32963027c..a347d8d2b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -35,9 +35,6 @@ Features
provided by WebOb. This allows the attribute to now be settable.
See https://github.com/Pylons/pyramid/pull/3447
-Bug Fixes
----------
-
Deprecations
------------
diff --git a/setup.py b/setup.py
index 3176442e1..afddbda35 100644
--- a/setup.py
+++ b/setup.py
@@ -100,19 +100,22 @@ setup(
extras_require={'testing': testing_extras, 'docs': docs_extras},
tests_require=tests_require,
test_suite="tests",
- entry_points="""\
- [pyramid.pshell_runner]
- python=pyramid.scripts.pshell:python_shell_runner
- [console_scripts]
- pserve = pyramid.scripts.pserve:main
- pshell = pyramid.scripts.pshell:main
- proutes = pyramid.scripts.proutes:main
- pviews = pyramid.scripts.pviews:main
- ptweens = pyramid.scripts.ptweens:main
- prequest = pyramid.scripts.prequest:main
- pdistreport = pyramid.scripts.pdistreport:main
- [paste.server_runner]
- wsgiref = pyramid.scripts.pserve:wsgiref_server_runner
- cherrypy = pyramid.scripts.pserve:cherrypy_server_runner
- """,
+ entry_points={
+ 'paste.server_runner': [
+ 'wsgiref = pyramid.scripts.pserve:wsgiref_server_runner',
+ 'cherrypy = pyramid.scripts.pserve:cherrypy_server_runner',
+ ],
+ 'pyramid.pshell_runner': [
+ 'python = pyramid.scripts.pshell:python_shell_runner'
+ ],
+ 'console_scripts': [
+ 'pserve = pyramid.scripts.pserve:main',
+ 'pshell = pyramid.scripts.pshell:main',
+ 'proutes = pyramid.scripts.proutes:main',
+ 'pviews = pyramid.scripts.pviews:main',
+ 'ptweens = pyramid.scripts.ptweens:main',
+ 'prequest = pyramid.scripts.prequest:main',
+ 'pdistreport = pyramid.scripts.pdistreport:main',
+ ],
+ },
)