From 7e7d73fd3e81c7bdc1a2fd870ccc86b2a97ea436 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Wed, 6 May 2015 13:14:57 -0700 Subject: [PATCH 1/4] adding pep8 to our build it is a useful tool thanks @remram44 to bring this up --- CMake/cdat_modules/pep8_deps.cmake | 1 + CMake/cdat_modules/pep8_externals.cmake | 16 ++++++++++++++++ CMake/cdat_modules/pep8_pkg.cmake | 18 ++++++++++++++++++ CMakeLists.txt | 1 + 4 files changed, 36 insertions(+) create mode 100644 CMake/cdat_modules/pep8_deps.cmake create mode 100644 CMake/cdat_modules/pep8_externals.cmake create mode 100644 CMake/cdat_modules/pep8_pkg.cmake diff --git a/CMake/cdat_modules/pep8_deps.cmake b/CMake/cdat_modules/pep8_deps.cmake new file mode 100644 index 0000000000..e57f7cf7e3 --- /dev/null +++ b/CMake/cdat_modules/pep8_deps.cmake @@ -0,0 +1 @@ +set(pep8_deps ${python_pkg} ${setuptools_pkg}) diff --git a/CMake/cdat_modules/pep8_externals.cmake b/CMake/cdat_modules/pep8_externals.cmake new file mode 100644 index 0000000000..c6dc541c76 --- /dev/null +++ b/CMake/cdat_modules/pep8_externals.cmake @@ -0,0 +1,16 @@ +# The pep8 project + +set(pep8_binary "${CMAKE_CURRENT_BINARY_DIR}/build/pep8") + +ExternalProject_Add(pep8 + DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR} + SOURCE_DIR ${pep8_binary} + URL ${PEP8_SOURCE} + URL_MD5 ${PEP8_MD5} + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND "" + BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build + INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX} + DEPENDS ${pep8_deps} + ${ep_log_options} + ) diff --git a/CMake/cdat_modules/pep8_pkg.cmake b/CMake/cdat_modules/pep8_pkg.cmake new file mode 100644 index 0000000000..31cb26bcbd --- /dev/null +++ b/CMake/cdat_modules/pep8_pkg.cmake @@ -0,0 +1,18 @@ +set( PEP8_MAJOR 1 ) +set( PEP8_MINOR 6 ) +set( PEP8_PATCH 2) +set( PEP8_VERSION ${PEP8_MAJOR}.${PEP8_MINOR}.${PEP8_PATCH} ) +set( PEP8_URL ${LLNL_URL} ) +set( PEP8_GZ pep8-${PEP8_VERSION}.tarz ) +set( PEP8_MD5 c7a3f57d832484a6295164661fbb1335 ) + +set (nm PEP8) +string(TOUPPER ${nm} uc_nm) +set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH}) +set(PEP8_SOURCE ${PEP8_URL}/${PEP8_GZ}) + +if (CDAT_BUILD_ALL) + add_cdat_package(pep8 "" "" ON) +else() + add_cdat_package(pep8 "" "" OFF) +endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 04a8ce7397..df00cb8f64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -488,6 +488,7 @@ include(dateutils_pkg) include(pyparsing_pkg) include(md5_pkg) include(mpi4py_pkg) +include(pep8_pkg) include(pyopenssl_pkg) include(setuptools_pkg) include(myproxyclient_pkg) From 2a993cfc301669cfe7f96658dba85d133cd6e1be Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Wed, 6 May 2015 13:19:34 -0700 Subject: [PATCH 2/4] Renamed ext file correctly --- CMake/cdat_modules/{pep8_externals.cmake => pep8_external.cmake} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CMake/cdat_modules/{pep8_externals.cmake => pep8_external.cmake} (100%) diff --git a/CMake/cdat_modules/pep8_externals.cmake b/CMake/cdat_modules/pep8_external.cmake similarity index 100% rename from CMake/cdat_modules/pep8_externals.cmake rename to CMake/cdat_modules/pep8_external.cmake From ac1330526806fdd719f5f37ca2da7033149fb7dc Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Wed, 6 May 2015 13:20:35 -0700 Subject: [PATCH 3/4] correct tarball name --- CMake/cdat_modules/pep8_pkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/cdat_modules/pep8_pkg.cmake b/CMake/cdat_modules/pep8_pkg.cmake index 31cb26bcbd..a512be7e4d 100644 --- a/CMake/cdat_modules/pep8_pkg.cmake +++ b/CMake/cdat_modules/pep8_pkg.cmake @@ -3,7 +3,7 @@ set( PEP8_MINOR 6 ) set( PEP8_PATCH 2) set( PEP8_VERSION ${PEP8_MAJOR}.${PEP8_MINOR}.${PEP8_PATCH} ) set( PEP8_URL ${LLNL_URL} ) -set( PEP8_GZ pep8-${PEP8_VERSION}.tarz ) +set( PEP8_GZ pep8-${PEP8_VERSION}.tar.gz ) set( PEP8_MD5 c7a3f57d832484a6295164661fbb1335 ) set (nm PEP8) From 187674f4b19b6b024e05147ef2f8649116a2e7e1 Mon Sep 17 00:00:00 2001 From: Aashish Chaudhary Date: Sat, 9 May 2015 09:16:45 -0400 Subject: [PATCH 4/4] Build pep8 only when testing is enabled Testing should be enabled for all developers and pep8 is a developers tool. --- CMake/cdat_modules/pep8_pkg.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMake/cdat_modules/pep8_pkg.cmake b/CMake/cdat_modules/pep8_pkg.cmake index a512be7e4d..c03f35261b 100644 --- a/CMake/cdat_modules/pep8_pkg.cmake +++ b/CMake/cdat_modules/pep8_pkg.cmake @@ -11,8 +11,6 @@ string(TOUPPER ${nm} uc_nm) set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH}) set(PEP8_SOURCE ${PEP8_URL}/${PEP8_GZ}) -if (CDAT_BUILD_ALL) +if (BUILD_TESTING) add_cdat_package(pep8 "" "" ON) -else() - add_cdat_package(pep8 "" "" OFF) endif()