diff --git a/recipes/dataframe/all/conandata.yml b/recipes/dataframe/all/conandata.yml index 91566611b6db3..61fe550263e99 100644 --- a/recipes/dataframe/all/conandata.yml +++ b/recipes/dataframe/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.22.0": + url: "https://github.com/hosseinmoein/DataFrame/archive/refs/tags/1.22.0.tar.gz" + sha256: "4b244241cd56893fccb22f7c874588f0d86b444912382ed6e9a4cf95e55ffda2" "1.21.0": url: "https://github.com/hosseinmoein/DataFrame/archive/refs/tags/1.21.0.tar.gz" sha256: "a6b07eaaf628225a34e4402c1a6e311430e8431455669ac03691d92f44081172" @@ -9,31 +12,20 @@ sources: url: "https://github.com/hosseinmoein/DataFrame/archive/1.19.0.tar.gz" sha256: "81382e9c68df7c52f69f645b1830fcd3634eedc07fa3d2024ee6c57cf2cdb7ff" "1.18.0": - sha256: 8cdb8b246263fbd8fcef07b6300f6aefb58b3a54cd67e5cbe5383bc948305844 - url: https://github.com/hosseinmoein/DataFrame/archive/1.18.0.tar.gz + url: "https://github.com/hosseinmoein/DataFrame/archive/1.18.0.tar.gz" + sha256: "8cdb8b246263fbd8fcef07b6300f6aefb58b3a54cd67e5cbe5383bc948305844" "1.17.0": - sha256: 669e9663de358330b15eacaa783ccf42fe16db27b9556fdcd18f1114c0335557 - url: https://github.com/hosseinmoein/DataFrame/archive/1.17.0.tar.gz + url: "https://github.com/hosseinmoein/DataFrame/archive/1.17.0.tar.gz" + sha256: "669e9663de358330b15eacaa783ccf42fe16db27b9556fdcd18f1114c0335557" "1.16.0": - sha256: a5a24ec07fb4761a294a291d7bed7c72e82e2dde8bba8bfc1ca2f68e07afd7fc - url: https://github.com/hosseinmoein/DataFrame/archive/1.16.0.tar.gz + url: "https://github.com/hosseinmoein/DataFrame/archive/1.16.0.tar.gz" + sha256: "a5a24ec07fb4761a294a291d7bed7c72e82e2dde8bba8bfc1ca2f68e07afd7fc" "1.15.0": - sha256: 68eb3fca66dff3f8473722d561e9391800957a09c2c6d4dde5f9ad37cbf88954 - url: https://github.com/hosseinmoein/DataFrame/archive/1.15.0.tar.gz + url: "https://github.com/hosseinmoein/DataFrame/archive/1.15.0.tar.gz" + sha256: "68eb3fca66dff3f8473722d561e9391800957a09c2c6d4dde5f9ad37cbf88954" "1.14.0": - sha256: 45991cc16e478b24641d0548aab24fd59ad534ada30fca8776fd9990e1914ac7 - url: https://github.com/hosseinmoein/DataFrame/archive/1.14.0.tar.gz + url: "https://github.com/hosseinmoein/DataFrame/archive/1.14.0.tar.gz" + sha256: "45991cc16e478b24641d0548aab24fd59ad534ada30fca8776fd9990e1914ac7" "1.12.0": - sha256: e951a699bd048bd7a034ac60bdd45f15cf066a04fda33cb22030d192b91a836c - url: https://github.com/hosseinmoein/DataFrame/archive/1.12.0.tar.gz - "1.8.0": - sha256: 43b057f6dedbdfc328667dc4dcdcd3384b4551cc2825ca546405ec955fb8cb35 - url: https://github.com/hosseinmoein/DataFrame/archive/1.8.0.tar.gz - "1.7.0": - sha256: b5f25e331bcd25f2ddd222e65563df3c316d726d92134789f043338545faa4d4 - url: https://github.com/hosseinmoein/DataFrame/archive/1.7.0.tar.gz -patches: - "1.8.0": - - patch_file: "patches/0001-remove-tests-bin-for-conan-package.patch" - "1.7.0": - - patch_file: "patches/0001-remove-tests-bin-for-conan-package.patch" + url: "https://github.com/hosseinmoein/DataFrame/archive/1.12.0.tar.gz" + sha256: "e951a699bd048bd7a034ac60bdd45f15cf066a04fda33cb22030d192b91a836c" diff --git a/recipes/dataframe/all/conanfile.py b/recipes/dataframe/all/conanfile.py index 33492673970a7..f596bf9ba05f7 100644 --- a/recipes/dataframe/all/conanfile.py +++ b/recipes/dataframe/all/conanfile.py @@ -52,9 +52,10 @@ class DataFrameConan(ConanFile): def _minimum_compilers_version(self): return { "Visual Studio": "15", + "msvc": "191", "gcc": "7", "clang": "6", - "apple-clang": "10.0" if Version(self.version) >= "1.12.0" else "9.0", + "apple-clang": "10.0", } def export_sources(self): @@ -144,7 +145,7 @@ def package_info(self): self.cpp_info.set_property("pkg_config_name", "DataFrame") self.cpp_info.libs = ["DataFrame"] if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.system_libs.extend(["pthread", "rt"]) + self.cpp_info.system_libs.extend(["pthread", "rt", "m"]) if is_msvc(self): self.cpp_info.defines.append("_USE_MATH_DEFINES") if Version(self.version) < "1.20.0" and not self.options.shared: diff --git a/recipes/dataframe/all/patches/0001-remove-tests-bin-for-conan-package.patch b/recipes/dataframe/all/patches/0001-remove-tests-bin-for-conan-package.patch deleted file mode 100644 index 1eae4efbddc42..0000000000000 --- a/recipes/dataframe/all/patches/0001-remove-tests-bin-for-conan-package.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 6cfbda5ec6f3d1d5987242c00af16ed4c1a65e7d Mon Sep 17 00:00:00 2001 -From: "Jimmy M. Gong" -Date: Mon, 10 Feb 2020 22:05:52 +0800 -Subject: [PATCH] remove tests bin for conan package - ---- - CMakeLists.txt | 146 ------------------------------------------------- - 1 file changed, 146 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 362bd95..b33ed49 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -216,149 +216,3 @@ endif(MSVC) - - # Add the uninstall target - include(AddUninstallTarget) -- --# Build the test binary --add_executable(dataframe_tester test/dataframe_tester.cc) --add_executable(dataframe_performance test/dataframe_performance.cc) --add_executable(vectors_tester test/vectors_tester.cc) --add_executable(vector_ptr_view_tester test/vector_ptr_view_tester.cc) --add_executable(date_time_tester test/date_time_tester.cc) --add_executable(mmfile_tester test/mmfile_tester.cc) --add_executable(obj_vector_tester test/obj_vector_tester.cc) --add_executable(obj_vector_erase_tester test/obj_vector_erase_tester.cc) --add_executable(sharedmem_tester test/sharedmem_tester.cc) --add_executable(gen_rand_tester test/gen_rand_tester.cc) -- --# Link the DataFrame library to the test binary --target_link_libraries(dataframe_tester DataFrame) -- --# Link the DataFrame library to the test binary --target_link_libraries(dataframe_performance DataFrame) -- --# Link the DataFrame library to the test binary --target_link_libraries(vectors_tester DataFrame) -- --# Link the DataFrame library to the test binary --target_link_libraries(vector_ptr_view_tester DataFrame) -- --# Link the DataFrame library to the test binary --target_link_libraries(date_time_tester DataFrame) -- --# Link the DataFrame library to the test binary --target_link_libraries(mmfile_tester DataFrame) -- --# Link the DataFrame library to the test binary --target_link_libraries(obj_vector_tester DataFrame) -- --# Link the DataFrame library to the test binary --target_link_libraries(obj_vector_erase_tester DataFrame) -- --# Link the DataFrame library to the test binary --target_link_libraries(sharedmem_tester DataFrame) -- --# Link the DataFrame library to the test binary --target_link_libraries(gen_rand_tester DataFrame) -- --if (UNIX) -- # Find pthreads library -- set(THREADS_PREFER_PTHREAD_FLAG ON) -- find_package(Threads REQUIRED) -- target_link_libraries(dataframe_tester Threads::Threads) -- target_link_libraries(dataframe_performance Threads::Threads) -- target_link_libraries(vectors_tester Threads::Threads) -- target_link_libraries(vector_ptr_view_tester Threads::Threads) -- target_link_libraries(date_time_tester Threads::Threads) -- target_link_libraries(mmfile_tester Threads::Threads) -- target_link_libraries(obj_vector_tester Threads::Threads) -- target_link_libraries(obj_vector_erase_tester Threads::Threads) -- target_link_libraries(sharedmem_tester Threads::Threads) -- target_link_libraries(gen_rand_tester Threads::Threads) --endif (UNIX) -- --if (UNIX AND NOT APPLE) -- target_link_libraries(dataframe_tester rt) -- target_link_libraries(dataframe_performance rt) -- target_link_libraries(vectors_tester rt) -- target_link_libraries(vector_ptr_view_tester rt) -- target_link_libraries(date_time_tester rt) -- target_link_libraries(mmfile_tester rt) -- target_link_libraries(obj_vector_tester rt) -- target_link_libraries(obj_vector_erase_tester rt) -- target_link_libraries(sharedmem_tester rt) -- target_link_libraries(gen_rand_tester rt) --endif() -- --# Enable ctest, testing so we can see if unit tests pass or fail in CI --enable_testing() --add_test(NAME dataframe_tester -- COMMAND dataframe_tester -- WORKING_DIRECTORY $) -- --# For some unknown reason to me, this test sigfaults in AppVeyor --# --# add_test(NAME vectors_tester --# COMMAND vectors_tester --# WORKING_DIRECTORY $) -- --add_test(NAME vector_ptr_view_tester -- COMMAND vector_ptr_view_tester -- WORKING_DIRECTORY $) --add_test(NAME date_time_tester -- COMMAND date_time_tester -- WORKING_DIRECTORY $) -- --# For some unknown reason to me, this test hangs in Travis CI --# --# add_test(NAME mmfile_tester --# COMMAND mmfile_tester --# WORKING_DIRECTORY $) -- --add_test(NAME obj_vector_tester -- COMMAND obj_vector_tester -- WORKING_DIRECTORY $) -- --add_test(NAME obj_vector_erase_tester -- COMMAND obj_vector_erase_tester -- WORKING_DIRECTORY $) --add_test(NAME gen_rand_tester -- COMMAND gen_rand_tester -- WORKING_DIRECTORY $) -- --message("-- Copying files for testing") --# Ctest require this files in the build dir, on all platforms --add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy -- ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data.csv -- ${CMAKE_CURRENT_BINARY_DIR}/sample_data.csv) --add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy -- ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data.json -- ${CMAKE_CURRENT_BINARY_DIR}/sample_data.json) --add_custom_command( -- TARGET ${PROJECT_NAME} POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy -- ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data_dt_index.csv -- ${CMAKE_CURRENT_BINARY_DIR}/sample_data_dt_index.csv) --add_custom_command( -- TARGET ${PROJECT_NAME} POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy -- ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data_string_index.csv -- ${CMAKE_CURRENT_BINARY_DIR}/sample_data_string_index.csv) -- --file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data.csv -- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/Debug) --file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data.csv -- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/Release) --file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data.json -- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/Debug) --file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data.json -- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/Release) --file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data_dt_index.csv -- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/Debug) --file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data_dt_index.csv -- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/Release) --file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data_string_index.csv -- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/Debug) --file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/sample_data_string_index.csv -- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/Release) --message("-- Copying files for testing - done") --- -2.25.0 - diff --git a/recipes/dataframe/all/test_v1_package/CMakeLists.txt b/recipes/dataframe/all/test_v1_package/CMakeLists.txt index ff71d0aea5f2c..be00a8c7f57c7 100644 --- a/recipes/dataframe/all/test_v1_package/CMakeLists.txt +++ b/recipes/dataframe/all/test_v1_package/CMakeLists.txt @@ -1,11 +1,8 @@ cmake_minimum_required(VERSION 3.8) -project(test_package LANGUAGES CXX) +project(test_package) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup(TARGETS) -find_package(DataFrame REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} ../test_package/test_package.cpp) -target_link_libraries(${PROJECT_NAME} PRIVATE DataFrame::DataFrame) -target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/ + ${CMAKE_CURRENT_BINARY_DIR}/test_package/) diff --git a/recipes/dataframe/all/test_v1_package/conanfile.py b/recipes/dataframe/all/test_v1_package/conanfile.py index 75c0cd81d2d2f..38f4483872d47 100644 --- a/recipes/dataframe/all/test_v1_package/conanfile.py +++ b/recipes/dataframe/all/test_v1_package/conanfile.py @@ -1,4 +1,3 @@ -# pylint: skip-file from conans import ConanFile, CMake, tools import os diff --git a/recipes/dataframe/config.yml b/recipes/dataframe/config.yml index ee0214f11ffb3..55fe67d4b4581 100644 --- a/recipes/dataframe/config.yml +++ b/recipes/dataframe/config.yml @@ -1,4 +1,6 @@ versions: + "1.22.0": + folder: all "1.21.0": folder: all "1.20.0": @@ -17,7 +19,3 @@ versions: folder: all "1.12.0": folder: all - "1.8.0": - folder: all - "1.7.0": - folder: all