Chris McDonough
2014-04-08 c7ebcdeee0cefead57e59ed0a708fc8b0b08d6ff
Merge branch 'master' of github.com:Pylons/pyramid
19 files deleted
1 files modified
136 ■■■■■ changed files
docs/narr/MyProject/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/narr/project.rst 22 ●●●●● patch | view | raw | blame | history
docs/quick_tour/awesome/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/quick_tour/package/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/quick_tour/sqla_demo/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/quick_tutorial/scaffolds/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/authorization/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/models/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/tests/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/views/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/tests/setup.cfg 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/views/setup.cfg 6 ●●●●● patch | view | raw | blame | history
pyramid/scaffolds/alchemy/setup.cfg_tmpl 6 ●●●●● patch | view | raw | blame | history
pyramid/scaffolds/starter/setup.cfg_tmpl 6 ●●●●● patch | view | raw | blame | history
pyramid/scaffolds/zodb/setup.cfg_tmpl 6 ●●●●● patch | view | raw | blame | history
pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl 6 ●●●●● patch | view | raw | blame | history
docs/narr/MyProject/setup.cfg
File was deleted
docs/narr/project.rst
@@ -492,7 +492,6 @@
  │   ├── tests.py
  │   └── views.py
  ├── production.ini
  ├── setup.cfg
  └── setup.py
The ``MyProject`` :term:`Project`
@@ -514,9 +513,6 @@
#. ``production.ini`` is a :term:`PasteDeploy` configuration file that can
   be used to execute your application in a production configuration.
#. ``setup.cfg`` is a :term:`setuptools` configuration file used by
   ``setup.py``.
#. ``MANIFEST.in`` is a :term:`distutils` "manifest" file, naming which files
   should be included in a source distribution of the package when ``python
@@ -744,24 +740,6 @@
This will create a tarball of your application in a ``dist`` subdirectory
named ``MyProject-0.1.tar.gz``.  You can send this tarball to other people
who want to install and use your application.
.. index::
   single: setup.cfg
``setup.cfg``
~~~~~~~~~~~~~
The ``setup.cfg`` file is a :term:`setuptools` configuration file.  It
contains various settings related to testing and internationalization:
Our generated ``setup.cfg`` looks like this:
.. literalinclude:: MyProject/setup.cfg
   :language: guess
   :linenos:
The values in the default setup file make the testing commands to work more
smoothly.
.. index::
   single: package
docs/quick_tour/awesome/setup.cfg
File was deleted
docs/quick_tour/package/setup.cfg
File was deleted
docs/quick_tour/sqla_demo/setup.cfg
File was deleted
docs/quick_tutorial/scaffolds/setup.cfg
File was deleted
docs/tutorials/wiki/src/authorization/setup.cfg
File was deleted
docs/tutorials/wiki/src/basiclayout/setup.cfg
File was deleted
docs/tutorials/wiki/src/models/setup.cfg
File was deleted
docs/tutorials/wiki/src/tests/setup.cfg
File was deleted
docs/tutorials/wiki/src/views/setup.cfg
File was deleted
docs/tutorials/wiki2/src/authorization/setup.cfg
File was deleted
docs/tutorials/wiki2/src/basiclayout/setup.cfg
File was deleted
docs/tutorials/wiki2/src/models/setup.cfg
File was deleted
docs/tutorials/wiki2/src/tests/setup.cfg
File was deleted
docs/tutorials/wiki2/src/views/setup.cfg
File was deleted
pyramid/scaffolds/alchemy/setup.cfg_tmpl
File was deleted
pyramid/scaffolds/starter/setup.cfg_tmpl
File was deleted
pyramid/scaffolds/zodb/setup.cfg_tmpl
File was deleted
pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl
File was deleted