(#15063) dataframe: add version 1.22.0, remove older versions

* dataframe: add version 1.22.0, remove older versions * remove pylint comment * link math lib
conan-io · Jan 13, 2023 · 582e6d9 · 582e6d9
1 parent f5b0d70
commit 582e6d9
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 202 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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