Browse Source

Remove requirements files in favor of setuptools extra

pull/360/head
Simon Conseil 6 years ago
parent
commit
6f932075d3
  1. 2
      docs/contribute.rst
  2. 6
      docs/installation.rst
  3. 6
      readthedocs.yml
  4. 3
      requirements-doc.txt
  5. 13
      requirements.txt
  6. 2
      setup.cfg
  7. 8
      tox.ini

2
docs/contribute.rst

@ -21,7 +21,7 @@ Install sigal in development mode::
Install additional dependencies for development (Sphinx, pytest), and optional Install additional dependencies for development (Sphinx, pytest), and optional
dependencies:: dependencies::
pip install -r requirements.txt pip install -e .\[all,tests\]
Building the docs Building the docs
----------------- -----------------

6
docs/installation.rst

@ -8,7 +8,7 @@ With pip::
Or to install with optional dependencies (listed below):: Or to install with optional dependencies (listed below)::
$ pip install sigal\[all\] $ pip install sigal\[all,tests\]
To install the development version, see the :doc:`contribute`. To install the development version, see the :doc:`contribute`.
@ -29,8 +29,8 @@ The mandatory dependencies are:
- Pillow - Pillow
- Python Markdown - Python Markdown
There are also a number of optional dependencies for the :doc:`plugins`, listed There are also a number of optional dependencies for the :doc:`plugins`,
in the ``requirements.txt`` file: installable with the ``[all]`` marker:
- Brotli, zopfli (compress assets plugin) - Brotli, zopfli (compress assets plugin)
- Boto (upload to S3 plugin) - Boto (upload to S3 plugin)

6
readthedocs.yml

@ -1,8 +1,12 @@
version: 2 version: 2
build:
image: latest
python: python:
version: 3.7 version: 3.7
install: install:
- method: pip - method: pip
path: . path: .
- requirements: requirements-doc.txt extra_requirements:
- docs

3
requirements-doc.txt

@ -1,3 +0,0 @@
-r requirements.txt
alabaster
Sphinx

13
requirements.txt

@ -1,13 +0,0 @@
blinker
boto
brotli
click
coverage
feedgenerator
Jinja2
Markdown
Pillow
pilkit
pytest
pytest-cov
zopfli

2
setup.cfg

@ -38,6 +38,8 @@ install_requires =
[options.extras_require] [options.extras_require]
all = boto; brotli; feedgenerator; zopfli all = boto; brotli; feedgenerator; zopfli
tests = pytest; pytest-cov
docs = Sphinx; alabaster
[options.packages.find] [options.packages.find]
exclude = exclude =

8
tox.ini

@ -9,8 +9,9 @@ python =
3.8: py38 3.8: py38
[testenv] [testenv]
deps = extras =
-r {toxinidir}/requirements.txt all
tests
commands = pytest --cov sigal --cov-report term-missing tests/ commands = pytest --cov sigal --cov-report term-missing tests/
[testenv:check] [testenv:check]
@ -28,8 +29,7 @@ commands =
[testenv:doc] [testenv:doc]
whitelist_externals = make whitelist_externals = make
deps = extras = docs
-r {toxinidir}/requirements-doc.txt
usedevelop = true usedevelop = true
commands = commands =
make -C docs html make -C docs html

Loading…
Cancel
Save