Merge branch 'functools' into 'master'

Add missing dependencies for flake8

See merge request !507

Build/AtlasLCG/modules/Findfunctools32.cmake

+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+# Sets:
+#  FUNCTOOLS32_PYTHON_PATH
+#
+# Can be steered by FUNCTOOLS32_LCGROOT.
+#
+
+# The LCG include(s).
+include( LCGFunctions )
+
+# Find it.
+lcg_python_external_module( NAME functools32
+   PYTHON_NAMES functools32/__init__.py )
+
+# Handle the standard find_package arguments.
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( functools32 DEFAULT_MSG
+   _FUNCTOOLS32_PYTHON_PATH )
+
+# Set up the RPM dependency.
+lcg_need_rpm( functools32 )

External/PyModules/CMakeLists.txt

@@ -23,9 +23,19 @@ endif()
 # External(s) needed:
 find_package( pip REQUIRED )
 
+# Here we list those dependencies of the packages that will be installed
+# with pip and that are already available via LCG. This ensures that the RPM
+# dependencies are declared correctly and those packages get installed.
+#
+# flake8:
+find_package( functools32 REQUIRED)
+find_package( enum34 REQUIRED)
+find_package( typing REQUIRED)
+
 # A common (temporary) installation directory for all python packages:
 set( _buildDir "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PyModulesBuild" )
 set( _pipStamp "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PyModules.stamp" )
+
 # List of python modules to install:
 set( _requirements "${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt" )