Skip to content

Commit

Permalink
pep8: Switch to package pycodestyle from pep8
Browse files Browse the repository at this point in the history
 * pep8 as package is discontinued, last release version is: 1.7.1
 * references:
   * PyCQA/pycodestyle#466
   * PyCQA/pycodestyle#481
   * https://github.com/PyCQA/pycodestyle/releases/tag/1.7.1

Signed-off-by: Andras Mitzki <andras.mitzki@balabit.com>
  • Loading branch information
Andras Mitzki committed Mar 18, 2018
1 parent 462eebb commit 7afb0b8
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dbld/images/required-pip/all.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
nose==1.3.7
ply==3.10
pep8==1.7.1
pycodestyle==2.3.1
pylint==1.8.2
astroid==1.6.1
logilab-common<=0.63.0
2 changes: 1 addition & 1 deletion modules/python/pylib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/install/ DESTINATION ${CMAKE_INSTA

if (BUILD_TESTING)
add_test(test_pylib_unit ${CMAKE_COMMAND} -E env nosetests ${CMAKE_CURRENT_SOURCE_DIR}/syslogng)
add_test(test_pylib_pep8 ${CMAKE_COMMAND} -E env pep8 --ignore=E501 ${CMAKE_CURRENT_SOURCE_DIR}/syslogng)
add_test(test_pylib_pycodestyle ${CMAKE_COMMAND} -E env pycodestyle --ignore=E501 ${CMAKE_CURRENT_SOURCE_DIR}/syslogng)
add_test(test_pylib_pylint ${CMAKE_COMMAND} -E env pylint -r n --rcfile=${CMAKE_CURRENT_SOURCE_DIR}/pylintrc ${CMAKE_CURRENT_SOURCE_DIR}/syslogng)
endif()
8 changes: 4 additions & 4 deletions modules/python/pylib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ clean-pylib:
rm -rf "$(PYLIB_BUILDDIR)/build"
rm -rf "$(SETUPPY_MANIFEST)"

python-checks: python-unit python-pep8 python-pylint
python-checks: python-unit python-pycodestyle python-pylint

python-unit:
nosetests $(PYLIB_SRCDIR)/syslogng

python-pep8:
pep8 --ignore=E501 $(PYLIB_SRCDIR)/syslogng
python-pycodestyle:
pycodestyle --ignore=E501 $(PYLIB_SRCDIR)/syslogng

python-pylint:
pylint -r n --rcfile=$(PYLIB_SRCDIR)/pylintrc $(PYLIB_SRCDIR)/syslogng
Expand All @@ -82,4 +82,4 @@ endif
.PHONY: install-pylib
.PHONY: uninstall-pylib
.PHONY: clean-pylib
.PHONY: python-checks python-unit python-pep8 python-pylint
.PHONY: python-checks python-unit python-pycodestyle python-pylint
2 changes: 1 addition & 1 deletion packaging/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 9~),
libriemann-client-dev (>= 1.6.0~),
librabbitmq-dev (>= 0.5.3~),
python, python-dev, pylint, dh-python,
pep8 | python-pep8,
pycodestyle | python-pycodestyle,
python-setuptools,
dh-exec,
python-nose, python-ply,
Expand Down

0 comments on commit 7afb0b8

Please sign in to comment.