diff options
| author | Martin Bornhold <martin@rhodecode.com> | 2016-09-30 13:32:56 +0200 |
|---|---|---|
| committer | Martin Bornhold <martin@rhodecode.com> | 2016-09-30 14:12:49 +0200 |
| commit | 3c88d3a9c4224801ba4ae34abac0a8d342640795 (patch) | |
| tree | 7baa1005ce8b1ca6c78f40d488b9996ea4323869 /pkgs | |
| parent | 7026cdf9e9d0d221534238023b7efbf1f04547a5 (diff) | |
| download | nixlib-3c88d3a9c4224801ba4ae34abac0a8d342640795.tar nixlib-3c88d3a9c4224801ba4ae34abac0a8d342640795.tar.gz nixlib-3c88d3a9c4224801ba4ae34abac0a8d342640795.tar.bz2 nixlib-3c88d3a9c4224801ba4ae34abac0a8d342640795.tar.lz nixlib-3c88d3a9c4224801ba4ae34abac0a8d342640795.tar.xz nixlib-3c88d3a9c4224801ba4ae34abac0a8d342640795.tar.zst nixlib-3c88d3a9c4224801ba4ae34abac0a8d342640795.zip | |
flake8: add patch to avoind pytest config conflict
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch new file mode 100644 index 000000000000..d75d8e7bd0ad --- /dev/null +++ b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch @@ -0,0 +1,22 @@ +diff -r ad8325924f04 pytest.ini +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/pytest.ini Fri Sep 30 12:28:39 2016 +0200 +@@ -0,0 +1,4 @@ ++[pytest] ++-norecursedirs = .git .* *.egg* old docs dist build ++-addopts = -rwv ++ +diff -r ad8325924f04 setup.cfg +--- a/setup.cfg Fri Sep 30 09:22:39 2016 +0200 ++++ b/setup.cfg Fri Sep 30 12:28:39 2016 +0200 +@@ -12,10 +12,6 @@ + pycodestyle >= 2.0.0, < 2.1.0 + mccabe >= 0.5.0, < 0.6.0 + +-[pytest] +-norecursedirs = .git .* *.egg* old docs dist build +-addopts = -rw +- + [egg_info] + tag_build = + tag_date = 0 |