diff options
| -rw-r--r-- | docs/tutorials/wiki/definingmodels.rst | 16 | ||||
| -rw-r--r-- | docs/tutorials/wiki/definingviews.rst | 16 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/models/setup.py | 9 |
3 files changed, 20 insertions, 21 deletions
diff --git a/docs/tutorials/wiki/definingmodels.rst b/docs/tutorials/wiki/definingmodels.rst index 8352c5344..3d2d01061 100644 --- a/docs/tutorials/wiki/definingmodels.rst +++ b/docs/tutorials/wiki/definingmodels.rst @@ -127,22 +127,6 @@ When we're done changing ``tests.py``, it will look something like so: :linenos: :language: python -Declaring Dependencies in Our ``setup.py`` File ------------------------------------------------ - -Our application now depends on packages which are not dependencies of the -original "tutorial" application as it was generated by the ``paster create`` -command. We'll add these dependencies to our ``tutorial`` package's -``setup.py`` file by assigning these dependencies to both the -``install_requires`` and the ``tests_require`` parameters to the ``setup`` -function. In particular, we require the ``docutils`` package. - -Our resulting ``setup.py`` should look like so: - -.. literalinclude:: src/models/setup.py - :linenos: - :language: python - Running the Tests ----------------- diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst index 31900233c..0d001db25 100644 --- a/docs/tutorials/wiki/definingviews.rst +++ b/docs/tutorials/wiki/definingviews.rst @@ -42,6 +42,22 @@ The source code for this tutorial stage can be browsed via `http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/views/ <http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/views/>`_. +Declaring Dependencies in Our ``setup.py`` File +----------------------------------------------- + +Our application now depends on packages which are not dependencies of the +original "tutorial" application as it was generated by the ``paster create`` +command. We'll add these dependencies to our ``tutorial`` package's +``setup.py`` file by assigning these dependencies to both the +``install_requires`` and the ``tests_require`` parameters to the ``setup`` +function. In particular, we require the ``docutils`` package. + +Our resulting ``setup.py`` should look like so: + +.. literalinclude:: src/models/setup.py + :linenos: + :language: python + Adding View Functions ===================== diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py index daa5e5eb1..2d540d65b 100644 --- a/docs/tutorials/wiki/src/models/setup.py +++ b/docs/tutorials/wiki/src/models/setup.py @@ -13,7 +13,6 @@ requires = [ 'repoze.retry', 'ZODB3', 'WebError', - 'docutils', ] setup(name='tutorial', @@ -21,9 +20,8 @@ setup(name='tutorial', description='tutorial', long_description=README + '\n\n' + CHANGES, classifiers=[ - "Intended Audience :: Developers", - "Framework :: Pylons", "Programming Language :: Python", + "Framework :: Pylons", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", ], @@ -34,8 +32,8 @@ setup(name='tutorial', packages=find_packages(), include_package_data=True, zip_safe=False, - install_requires=requires, - tests_require=requires, + install_requires = requires, + tests_require= requires, test_suite="tutorial", entry_points = """\ [paste.app_factory] @@ -43,3 +41,4 @@ setup(name='tutorial', """, paster_plugins=['pyramid'], ) + |