Merge pull request #124 from nblock/next

Misc improvements
PyFeeds · Jul 4, 2018 · 6ecc9db · 6ecc9db
2 parents f032b19 + 4361594
commit 6ecc9db
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 15 deletions.
diff --git a/.isort.cfg b/.isort.cfg
@@ -5,3 +5,4 @@ include_trailing_comma = True
 force_grid_wrap = 0
 line_length = 88
 not_skip = __init__.py
+skip_glob = */.tox/*
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ python:
   - "3.6"
 
 install:
-  - pip install -r requirements/development.txt
+  - pip install flake8
 
 script:
   - flake8 .
diff --git a/docs/conf.py b/docs/conf.py
@@ -94,7 +94,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
+# html_static_path = ["_static"]
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.

diff --git a/docs/spiders/orf.at.rst b/docs/spiders/orf.at.rst
@@ -14,8 +14,8 @@ Add ``orf.at`` to the list of spiders:
    spiders =
      orf.at
 
-orf.at supports different channels via the ``channels`` parameter (one per line). If no
-channel is given, ``news`` is used.
+orf.at supports different channels via the ``channels`` parameter (one per
+line). If no channel is given, ``news`` is used.
 
 .. code-block:: ini
 

diff --git a/requirements/development.txt b/requirements/development.txt
diff --git a/requirements/production.txt b/requirements/production.txt
diff --git a/setup.py b/setup.py
@@ -18,8 +18,8 @@
         "lxml>=3.5.0",
     ],
     extras_require={
-        "doc": ["doc8", "restructuredtext_lint", "sphinx", "sphinx_rtd_theme"],
-        "test": ["flake8", "black", "isort"],
+        "docs": ["doc8", "restructuredtext_lint", "sphinx", "sphinx_rtd_theme"],
+        "style": ["black", "flake8", "isort"],
     },
     entry_points="""
         [console_scripts]

diff --git a/tox.ini b/tox.ini
@@ -2,14 +2,16 @@
 envlist = py34,py35,py36
 
 [testenv:style]
-extras = test
+# Black requires Python 3.6+
+basepython = python3.6
+extras = style
 commands =
     flake8 feeds
     black --check feeds
     isort --check-only -rc feeds
 
 [testenv:docs]
-extras = doc
+extras = docs
 commands =
     rst-lint README.rst
     doc8 docs/