Skip to content

Commit aa2844e

Browse files
committed
Add flake8 to virtual environment and run linting on test cases
1 parent 2ccbe0d commit aa2844e

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

mapscript/python/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,26 @@ add_custom_command(
9292
OUTPUT mapscriptvenvpop.stamp
9393
WORKING_DIRECTORY ${OUTPUT_FOLDER}
9494
COMMENT "Installing the required packages into the virtual environment"
95-
COMMAND ${PYTHON_VENV_SCRIPTS}/python -m pip install pip --upgrade
95+
COMMAND ${PYTHON_VENV_SCRIPTS}/python -m pip install pip --upgrade --force-reinstall
9696
COMMAND ${PYTHON_VENV_SCRIPTS}/pip install -r ${PROJECT_SOURCE_DIR}/mapscript/python/requirements-dev.txt
9797
)
9898

9999
add_custom_command(
100100
DEPENDS mapscriptvenvpop.stamp
101101
OUTPUT mapscriptwheel.stamp
102102
WORKING_DIRECTORY ${OUTPUT_FOLDER}
103-
COMMENT "Building the mapscript Python wheel"
103+
COMMENT "Copying files required to build Mapscript"
104104
COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/mapscript/python/mapscript/__init__.py" $<TARGET_FILE_DIR:${SWIG_MODULE_pythonmapscript_REAL_NAME}>/mapscript/__init__.py
105105
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/mapscript.py" $<TARGET_FILE_DIR:${SWIG_MODULE_pythonmapscript_REAL_NAME}>/mapscript/mapscript.py
106106
COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${SWIG_MODULE_pythonmapscript_REAL_NAME}>" "$<TARGET_FILE_DIR:${SWIG_MODULE_pythonmapscript_REAL_NAME}>/mapscript/$<TARGET_FILE_NAME:${SWIG_MODULE_pythonmapscript_REAL_NAME}>"
107107
COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/mapscript/python/README.rst" $<TARGET_FILE_DIR:${SWIG_MODULE_pythonmapscript_REAL_NAME}>/README.rst
108108
COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/mapscript/python/tests/cases" $<TARGET_FILE_DIR:${SWIG_MODULE_pythonmapscript_REAL_NAME}>/mapscript/tests
109+
# now check the Python test code with flake8
110+
COMMENT "Linting test code files"
111+
COMMAND ${PYTHON_VENV_SCRIPTS}/flake8 $<TARGET_FILE_DIR:${SWIG_MODULE_pythonmapscript_REAL_NAME}>/mapscript/tests --max-line-length=120
109112
COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/tests" $<TARGET_FILE_DIR:${SWIG_MODULE_pythonmapscript_REAL_NAME}>/mapscript/tests/data
110113
COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/mapscript/python/examples" $<TARGET_FILE_DIR:${SWIG_MODULE_pythonmapscript_REAL_NAME}>/mapscript/examples
114+
COMMENT "Building the mapscript Python wheel"
111115
COMMAND ${PYTHON_VENV_SCRIPTS}/python setup.py bdist_wheel
112116
)
113117

mapscript/python/requirements-dev.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
pytest
22
pillow
33
wheel>=0.31.1
4-
setuptools>=40.2.0
4+
setuptools>=40.2.0
5+
flake8

0 commit comments

Comments
 (0)