Moved all dev dependencies into setup.py

* Removed requirements-dev.txt
 * Added dependencies to setup.py using the extras_require option
 * Updated the documentation to use pip instead of setup.py develop
 * Updated .drone.yml to reflect updated installation
pull/2167/merge
Charlie Choiniere 2016-02-02 20:56:48 -05:00 zatwierdzone przez Matt Westcott
rodzic 6d5b47dd6a
commit ae2006ccf1
4 zmienionych plików z 33 dodań i 14 usunięć

Wyświetl plik

@ -19,8 +19,7 @@ build:
image: python:3.5
commands:
- XDG_CACHE_HOME=/drone/pip-cache pip install wheel
- XDG_CACHE_HOME=/drone/pip-cache pip install -r requirements-dev.txt
- XDG_CACHE_HOME=/drone/pip-cache pip install -e .
- XDG_CACHE_HOME=/drone/pip-cache pip install -e .[testing,docs]
- python runtests.py
cache:

Wyświetl plik

@ -22,11 +22,11 @@ Clone a copy of `the Wagtail codebase <https://github.com/torchbox/wagtail>`_:
git clone https://github.com/torchbox/wagtail.git
cd wagtail
With your preferred virtualenv activated, install the Wagtail package in development mode:
With your preferred virtualenv activated, install the Wagtail package in development mode with the included testing and documentation dependencies:
.. code-block:: sh
python setup.py develop
pip install -e .[testing,docs]
Install the tool chain for building static assets:
@ -42,16 +42,6 @@ Compile the assets:
Any Wagtail sites you start up in this virtualenv will now run against this development instance of Wagtail. We recommend using the `Wagtail demo site <https://github.com/torchbox/wagtaildemo/>`_ as a basis for developing Wagtail.
Development dependencies
~~~~~~~~~~~~~~~~~~~~~~~~
Developing Wagtail requires additional Python modules for testing and documentation.
The list of dependencies is in the Wagtail root directory in ``requirements-dev.txt`` and can be installed thus, from the Wagtail codebase root directory::
pip install -r requirements-dev.txt
.. _testing:
Testing

Wyświetl plik

@ -1,3 +1,7 @@
# [RemovedInWagtail16Warning]
# DEPRECATED. Developer requirements should now be specified in setup.py
# in 'testing_extras' / 'documentation_extras'.
# Required for running the tests
mock>=1.0.0
python-dateutil>=2.2

Wyświetl plik

@ -33,6 +33,28 @@ install_requires = [
"Willow>=0.2.2,<0.3",
]
# Testing dependencies
testing_extras = [
# Required for running the tests
'mock>=1.0.0',
'python-dateutil>=2.2',
'pytz>=2014.7',
'Pillow>=2.7.0',
'elasticsearch>=1.0.0',
# For coverage and PEP8 linting
'coverage>=3.7.0',
'flake8>=2.2.0',
]
# Documentation dependencies
documentation_extras = [
'Sphinx>=1.3.1',
'sphinx-autobuild>=0.5.2',
'sphinx_rtd_theme>=0.1.8',
'sphinxcontrib-spelling==2.1.1',
'pyenchant==1.6.6',
]
setup(
name='wagtail',
@ -64,6 +86,10 @@ setup(
'Topic :: Internet :: WWW/HTTP :: Site Management',
],
install_requires=install_requires,
extras_require={
'testing': testing_extras,
'docs': documentation_extras
},
entry_points="""
[console_scripts]
wagtail=wagtail.bin.wagtail:main