Merge branch 'revert-6652feaa' into 'master'

Revert "Merge branch 'pyfwdbwd_warning' into 'master'"

See merge request atlas/athena!22142

External/AtlasPyFwdBwdPorts/CMakeLists.txt

@@ -26,7 +26,7 @@ function( _setup_python_package name file md5 )
    endif()
 
    if ( ARG_PATCH )
-     set( _patchCmd PATCH_COMMAND patch -p0 -N < ${ARG_PATCH} )
+     set( _patchCmd PATCH_COMMAND patch -p1 < ${ARG_PATCH} )
    endif()
 
    # Build the package with the help of python's distutils:
@@ -101,7 +101,6 @@ _setup_python_package( flake8
    ${CMAKE_CURRENT_SOURCE_DIR}/src/flake8-3.6.0.tar.gz
    178485aed0799655d0cbf2e3bdcfaddc
    DEPENDS pyflakes pycodestyle mccabe
-   PATCH ${CMAKE_CURRENT_SOURCE_DIR}/src/flake8.patch
    SINGLE_VERSION )
 
 # Install mccabe:
@@ -114,7 +113,6 @@ _setup_python_package( mccabe
 _setup_python_package( pycodestyle 
    ${CMAKE_CURRENT_SOURCE_DIR}/src/pycodestyle-2.4.0.tar.gz
    85bbebd2c90d2f833c1db467d4d0e9a3
-   PATCH ${CMAKE_CURRENT_SOURCE_DIR}/src/pycodestyle.patch
    SINGLE_VERSION )
 
 # Install pyyaml:

External/AtlasPyFwdBwdPorts/src/flake8.patch

---- MANIFEST.in.orig	2019-03-22 12:15:46.297675836 +0100
-+++ MANIFEST.in	2019-03-22 12:15:50.950678995 +0100
-@@ -2,7 +2,6 @@
- include CONTRIBUTORS.txt
- include LICENSE
- include *.ini
--global-exclude *.pyc
- recursive-include docs *.rst *.py
- recursive-include tests *.py *.ini *.rst *_diff
- recursive-include src *.py

External/AtlasPyFwdBwdPorts/src/pycodestyle.patch

---- MANIFEST.in.orig	2019-03-22 12:11:47.290516338 +0100
-+++ MANIFEST.in	2019-03-22 12:11:56.543522499 +0100
-@@ -2,9 +2,5 @@
- include *.rst
- include LICENSE
- recursive-include docs *
--recursive-include testsuite *
--recursive-exclude docs *.pyc
--recursive-exclude docs *.pyo
--recursive-exclude testsuite *.pyc
--recursive-exclude testsuite *.pyo
-+recursive-include testsuite *.py
- prune docs/_build