PyPi 2.2.1

- Fixes to token submission system - Fixes TiMemoryConfig.cmake when python package is installed in site.getsitepackages() that is not what is expected
NERSC · Jun 6, 2018 · 0020572 · 0020572
1 parent 7d9811b
commit 0020572
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 19 deletions.
diff --git a/.version.txt b/.version.txt
@@ -1 +1 @@
-2.2.0
+2.2.1
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,13 @@
 TiMemory
 ========
 
+Release: TiMemory 2.2.1
+-----------------------
+
+Author: Jonathan R. Madsen Date: Tue Jun 6 01:32:45 2018 -0700
+
+- fix to TiMemoryConfig.cmake when installed via sudo
+
 Release: TiMemory 2.2.0
 -----------------------
 

diff --git a/cmake/Templates/CTestCustom.cmake.in b/cmake/Templates/CTestCustom.cmake.in
@@ -3,3 +3,19 @@ set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS           "200" )
 set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS         "500" )
 set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE    "104857600") # 100 MB
 set(CTEST_CUSTOM_COVERAGE_EXCLUDE                   "pybind11/*;source/cereal/*")
+
+macro(set_custom VAR CUSTOM_VAL)
+    if(NOT "${CUSTOM_VAL}" STREQUAL "")
+        set(${VAR} "${CUSTOM_VAL}")
+    endif(NOT "${CUSTOM_VAL}" STREQUAL "")
+endmacro(set_custom VAR CUSTOM_VAL)
+
+set(_DROP_METHOD    "@DROP_METHOD@")
+set(_DROP_SITE      "@DROP_SITE@")
+set(_DROP_LOCATION  "@DROP_LOCATION@")
+set(_TOKEN_FILE     "@TOKEN_FILE@")
+
+set_custom(CTEST_DROP_METHOD    "${_DROP_METHOD}")
+set_custom(CTEST_DROP_SITE      "${_DROP_SITE}")
+set_custom(CTEST_DROP_LOCATION  "${_DROP_LOCATION}")
+set_custom(CTEST_TOKEN_FILE     "${_TOKEN_FILE}")
diff --git a/cmake/Templates/TiMemoryConfig.cmake.in b/cmake/Templates/TiMemoryConfig.cmake.in
@@ -12,6 +12,9 @@ set(TIMEMORY_USE_MPI @MPI_FOUND@)
 set(TIMEMORY_EXCEPTIONS @TIMEMORY_EXCEPTIONS@)
 set(TIMEMORY_PYTHON_BINDINGS @TIMEMORY_USE_PYTHON_BINDING@)
 set(TIMEMORY_DYNAMIC_LINK @BUILD_SHARED_LIBS@)
+if(NOT DEFINED @PROJECT_NAME@_DIR)
+    set(@PROJECT_NAME@_DIR ${CMAKE_CURRENT_LIST_DIR})
+endif(NOT DEFINED @PROJECT_NAME@_DIR)
 
 #------------------------------------------------------------------------------#
 #   Determine install tree or build tree
@@ -28,8 +31,19 @@ if(_TIMEMORY_INSTALL_TREE)
 
     set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
     set_and_check(@PROJECT_NAME@_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+
     if(TIMEMORY_PYTHON_BINDINGS)
-        set_and_check(@PROJECT_NAME@_PYTHON_DIR "@PACKAGE_PYTHON_INSTALL_DIR@")
+        set(@PROJECT_NAME@_PYTHON_DIR "@PACKAGE_PYTHON_INSTALL_DIR@")
+        if(NOT EXISTS ${@PROJECT_NAME@_PYTHON_DIR})
+            find_package(PythonInterp QUIET)
+            if(PYTHONINTERP_FOUND)
+                execute_process(COMMAND
+                    ${PYTHON_EXECUTABLE} -c "import site; print(site.getsitepackages()[0])"
+                    OUTPUT_VARIABLE @PROJECT_NAME@_PYTHON_DIR
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+            endif(PYTHONINTERP_FOUND)
+        endif(NOT EXISTS ${@PROJECT_NAME@_PYTHON_DIR})
     endif(TIMEMORY_PYTHON_BINDINGS)
 
     foreach(_TYPE LIB INCLUDE PYTHON)
@@ -156,17 +170,8 @@ endif(TIMEMORY_USE_MPI)
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set UnitTest++_FOUND to TRUE
 # if all listed variables are TRUE
-if(TIMEMORY_PYTHON_BINDINGS)
-    find_package_handle_standard_args(@PROJECT_NAME@ DEFAULT_MSG
-        @PROJECT_NAME@_LIBRARIES
-        @PROJECT_NAME@_C_LIBRARIES
-        @PROJECT_NAME@_CXX_LIBRARIES
-        @PROJECT_NAME@_INCLUDE_DIR
-        @PROJECT_NAME@_PYTHON_DIR)
-else(TIMEMORY_PYTHON_BINDINGS)
-    find_package_handle_standard_args(@PROJECT_NAME@ DEFAULT_MSG
-        @PROJECT_NAME@_LIBRARIES
-        @PROJECT_NAME@_C_LIBRARIES
-        @PROJECT_NAME@_CXX_LIBRARIES
-        @PROJECT_NAME@_INCLUDE_DIR)
-endif(TIMEMORY_PYTHON_BINDINGS)
+find_package_handle_standard_args(@PROJECT_NAME@ DEFAULT_MSG
+    @PROJECT_NAME@_LIBRARIES
+    @PROJECT_NAME@_C_LIBRARIES
+    @PROJECT_NAME@_CXX_LIBRARIES
+    @PROJECT_NAME@_INCLUDE_DIR)
diff --git a/cmake/Templates/cdash/Init.cmake.in b/cmake/Templates/cdash/Init.cmake.in
@@ -22,11 +22,11 @@ set(CTEST_GENERATOR          "'@CMAKE_GENERATOR@'")
 set(CTEST_LOCAL_CHECKOUT     "@CTEST_LOCAL_CHECKOUT@")
 set(CTEST_GENERATOR_PLATFORM "@CMAKE_GENERATOR_PLATFORM@")
 set(MPI_FOUND                "@MPI_FOUND@")
+set(CTEST_TOKEN_FILE         "@TOKEN_FILE@")
 if(NOT DEFINED CTEST_MODEL)
     set(CTEST_MODEL          "@CTEST_MODEL@")
 endif(NOT DEFINED CTEST_MODEL)
 
-
 # ---------------------------------------------------------------------------- #
 # -- Programs
 # ---------------------------------------------------------------------------- #
@@ -199,38 +199,99 @@ set(ENV{PROJECT_PYC_PATH}   "${CTEST_INSTALL_DIRECTORY}/@TIMEMORY_INSTALL_PYTHON
 # -- Configure file
 # ---------------------------------------------------------------------------- #
 macro(CONFIGURE_CTEST_FILES)
+
     ## -- CTest Config
     configure_file(CTestConfig.cmake ${CTEST_BINARY_DIRECTORY}/CTestConfig.cmake COPYONLY)
     ## -- CTest Custom
     configure_file(CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake COPYONLY)
+
 endmacro(CONFIGURE_CTEST_FILES)
 
 
 # ---------------------------------------------------------------------------- #
 # -- Read CTestNotes.cmake file
 # ---------------------------------------------------------------------------- #
 macro(READ_NOTES)
+
     ## check
     file(GLOB_RECURSE NOTE_FILES "${CTEST_BINARY_DIRECTORY}/*CTestNotes.cmake")
     foreach(_FILE ${NOTE_FILES})
         include("${_FILE}")
     endforeach(_FILE ${NOTE_FILES})
+
 endmacro(READ_NOTES)
 
 
+# ---------------------------------------------------------------------------- #
+# -- Check to see if there is a ctest token (for CDash submission)
+# ---------------------------------------------------------------------------- #
+macro(CHECK_FOR_CTEST_TOKEN)
+
+    # set using token to off
+    set(CTEST_USE_TOKEN OFF)
+    # set token to empty
+    set(CTEST_TOKEN     "")
+
+    if(NOT "${CTEST_TOKEN_FILE}" STREQUAL "")
+        string(REGEX REPLACE "^~" "$ENV{HOME}" CTEST_TOKEN_FILE "${CTEST_TOKEN_FILE}")
+    endif(NOT "${CTEST_TOKEN_FILE}" STREQUAL "")
+
+    # check for a file containing token
+    if(NOT "${CTEST_TOKEN_FILE}" STREQUAL "" AND EXISTS "${CTEST_TOKEN_FILE}")
+        message(STATUS "Reading CTest token file: ${CTEST_TOKEN_FILE}")
+        file(READ "${CTEST_TOKEN_FILE}" CTEST_TOKEN)
+        string(REPLACE "\n" "" CTEST_TOKEN "${CTEST_TOKEN}")
+    endif(NOT "${CTEST_TOKEN_FILE}" STREQUAL "" AND EXISTS "${CTEST_TOKEN_FILE}")
+
+    # if no file, check the environment
+    if("${CTEST_TOKEN}" STREQUAL "" AND NOT "$ENV{CTEST_TOKEN}" STREQUAL "")
+        set(CTEST_TOKEN "$ENV{CTEST_TOKEN}")
+    endif("${CTEST_TOKEN}" STREQUAL "" AND NOT "$ENV{CTEST_TOKEN}" STREQUAL "")
+
+    # if non-empty token, set CTEST_USE_TOKEN to ON
+    if(NOT "${CTEST_TOKEN}" STREQUAL "")
+        set(CTEST_USE_TOKEN ON)
+    endif(NOT "${CTEST_TOKEN}" STREQUAL "")
+
+endmacro(CHECK_FOR_CTEST_TOKEN)
+
+
+# ---------------------------------------------------------------------------- #
+# -- Submit command
+# ---------------------------------------------------------------------------- #
+macro(SUBMIT_COMMAND)
+
+    # check for token
+    check_for_ctest_token()
+
+    if(NOT CTEST_USE_TOKEN)
+        # standard submit
+        ctest_submit(RETURN_VALUE ret ${ARGN})
+    else(NOT CTEST_USE_TOKEN)
+        # submit with token
+        ctest_submit(RETURN_VALUE ret
+                     HTTPHEADER "Authorization: Bearer ${CTEST_TOKEN}"
+                     ${ARGN})
+    endif(NOT CTEST_USE_TOKEN)
+
+endmacro(SUBMIT_COMMAND)
+
+
 # ---------------------------------------------------------------------------- #
 # -- Determine if submit time
 # ---------------------------------------------------------------------------- #
 macro(SUBMIT KEY)
+
     if("${TRIGGER}" STREQUAL "Any" OR "${TRIGGER}" STREQUAL "Submit")
         read_notes()
+        submit_command(${ARGN})
         ctest_submit(RETURN_VALUE ret ${ARGN})
     else("${TRIGGER}" STREQUAL "Any" OR "${TRIGGER}" STREQUAL "Submit")
         if("${TRIGGER}" STREQUAL "${KEY}")
-            read_notes()
-            ctest_submit(RETURN_VALUE ret ${ARGN})
+            submit_command(${ARGN})
         endif("${TRIGGER}" STREQUAL "${KEY}")
     endif("${TRIGGER}" STREQUAL "Any" OR "${TRIGGER}" STREQUAL "Submit")
+
 endmacro(SUBMIT KEY)