datasketches 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1ea0f9f2d12b0e46c2d4c7dec21f41992e711e73eca68ea1ef03a4bb711077
-  data.tar.gz: 92f56b63da0254962be47d8d3e00a6950a271053bf3152167f95e6fdb99528e6
+  metadata.gz: 4a7fef851c11ba93a002a6215f76170b973628f8b1f0a89fb89a5e655f6a421a
+  data.tar.gz: a590d7cde413596640f8bf169db67742696d7e304097be8bc0820244ed32ebd5
 SHA512:
-  metadata.gz: 5841d4a70f1e852faa150f57ebfefc7b975de020782c41eebdad87a01d016be9bdf86f86173600632bf6f56300df0c9c4196251aa5df02a47ecd357ac844ef80
-  data.tar.gz: d6ae7c811e0e2c2008b912e29f86d1b99491c74cd878790dfd800811a007f0dbf9c49bb59db30345450ff82673381f2c036a84a57dc44a6f6751610d9be2ee88
+  metadata.gz: dea9986097b4e9e4c7aba8b6f69108dce21caa2f6fa1e8723a9bf8be2077b925507bf84bd92bc794c1831285963f8ecb8f4739797c3246a15a438a82816043d6
+  data.tar.gz: 64f2ed1ed4656c09057892ae493a9a2c7178b3090dd84c24105b9e2f16d45f9aaed728c2bb6154e6518e018bbd240f5c2e562fa2edbee397b5deccb8b1dd11f5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.7 (2022-11-05)
+
+- Updated DataSketches to 3.5.1
+
 ## 0.2.6 (2022-07-13)
 
 - Updated DataSketches to 3.5.0

data/LICENSE

@@ -255,10 +255,8 @@ APPENDIX B: Additional licenses relevant to this product.
     =============================================================
     Boost License  (https://www.boost.org/LICENSE_1_0.txt)
     =============================================================
-    Original source code:
-      https://github.com/catchorg/Catch2/blob/master/single_include/catch2/catch.hpp
-    -------------------------------------------------------------
-    Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
+    Original source:
+       https://github.com/catchorg/Catch2/blob/v2.x/LICENSE.txt
 
     Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -285,8 +283,8 @@ APPENDIX B: Additional licenses relevant to this product.
     DEALINGS IN THE SOFTWARE.
     -------------------------------------------------------------
     Code Locations:
-      * https://github.com/apache/datasketches-cpp/blob/master/common/test/catch.hpp
-    that is adapted from the above.
+    Found in the Catch2 unit test code that is downloaded from github.com as part
+    of CMake configuration if configured to build tests.
 
 
     =============================================================

data/NOTICE

@@ -1,11 +1,12 @@
-Apache DataSketches-cpp
-Copyright 2020-2021 The Apache Software Foundation
+Apache DataSketches C++ and Python
+Copyright 2022 The Apache Software Foundation
 
-Copyright 2015-2018 Yahoo
-Copyright 2019 Verizon Media
+Copyright 2015-2018 Yahoo Inc.
+Copyright 2019-2020 Verizon Media
+Copyright 2021 Yahoo Inc.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 Prior to moving to ASF, the software for this project was developed at
-Yahoo (now Verizon Media) (https://developer.yahoo.com).
+Yahoo Inc. (https://developer.yahoo.com).

data/lib/datasketches/version.rb

@@ -1,3 +1,3 @@
 module DataSketches
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/vendor/datasketches-cpp/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 cmake_minimum_required(VERSION 3.16.0)
 project(DataSketches
-        VERSION 3.5.0
+        VERSION 3.5.1
         LANGUAGES CXX)
 
 include(GNUInstallDirs)

data/vendor/datasketches-cpp/LICENSE

@@ -255,10 +255,8 @@ APPENDIX B: Additional licenses relevant to this product.
     =============================================================
     Boost License  (https://www.boost.org/LICENSE_1_0.txt)
     =============================================================
-    Original source code:
-      https://github.com/catchorg/Catch2/blob/master/single_include/catch2/catch.hpp
-    ------------------------------------------------------------- 
-    Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
+    Original source:
+       https://github.com/catchorg/Catch2/blob/v2.x/LICENSE.txt
 
     Boost Software License - Version 1.0 - August 17th, 2003
     
@@ -285,8 +283,8 @@ APPENDIX B: Additional licenses relevant to this product.
     DEALINGS IN THE SOFTWARE.
     -------------------------------------------------------------
     Code Locations:
-      * https://github.com/apache/datasketches-cpp/blob/master/common/test/catch.hpp
-    that is adapted from the above.
+    Found in the Catch2 unit test code that is downloaded from github.com as part
+    of CMake configuration if configured to build tests.
 
 
     =============================================================

data/vendor/datasketches-cpp/MANIFEST.in

@@ -7,8 +7,6 @@ global-include *.bin
 
 global-exclude .git*
 
-recursive-include python/pybind11 *
-
 graft cmake
 graft common
 graft cpc

data/vendor/datasketches-cpp/common/test/CMakeLists.txt

@@ -21,6 +21,18 @@
 # common dependencies for tests
 add_library(common_test OBJECT "")
 
+include(FetchContent)
+
+FetchContent_Declare(
+  Catch2
+  GIT_REPOSITORY https://github.com/catchorg/Catch2
+  GIT_TAG        v2.13.9
+)
+
+FetchContent_MakeAvailable(Catch2)
+
+target_link_libraries(common_test PUBLIC Catch2::Catch2)
+
 set_target_properties(common_test PROPERTIES
   CXX_STANDARD 11
   CXX_STANDARD_REQUIRED YES
@@ -33,7 +45,6 @@ target_include_directories(common_test
 
 target_sources(common_test
   INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/catch.hpp  
     ${CMAKE_CURRENT_SOURCE_DIR}/test_allocator.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_type.hpp
   PRIVATE
@@ -59,4 +70,4 @@ add_test(
 target_sources(integration_test
   PRIVATE
     integration_test.cpp
-)
+)

data/vendor/datasketches-cpp/common/test/catch_runner.cpp

@@ -1,7 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 #ifndef _TEST_COMMON_HPP_
 #define _TEST_COMMON_HPP_
 
+// this largely just ensures that, for our simple test cases at least,
+// we define main() exactly once per test executable
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 #endif // _TEST_COMMON_HPP_

data/vendor/datasketches-cpp/common/test/integration_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "cpc_sketch.hpp"
 #include "cpc_union.hpp"

data/vendor/datasketches-cpp/cpc/test/compression_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <algorithm>
 
 #include "cpc_compressor.hpp"

data/vendor/datasketches-cpp/cpc/test/cpc_sketch_allocation_test.cpp

@@ -22,7 +22,7 @@
 #include <sstream>
 #include <fstream>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "cpc_sketch.hpp"
 #include "cpc_union.hpp"

data/vendor/datasketches-cpp/cpc/test/cpc_sketch_test.cpp

@@ -23,7 +23,7 @@
 #include <fstream>
 #include <stdexcept>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "cpc_sketch.hpp"
 

data/vendor/datasketches-cpp/cpc/test/cpc_union_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "cpc_union.hpp"
 

data/vendor/datasketches-cpp/fi/include/reverse_purge_hash_map_impl.hpp

@@ -71,8 +71,8 @@ states_(nullptr)
       if (other.states_[i] > 0) {
         new (&keys_[i]) K(other.keys_[i]);
         values_[i] = other.values_[i];
+         if (--num == 0) break;
       }
-      if (--num == 0) break;
     }
   }
   std::copy(other.states_, other.states_ + size, states_);

data/vendor/datasketches-cpp/fi/test/frequent_items_sketch_custom_type_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sstream>
 #include <stdexcept>
 

data/vendor/datasketches-cpp/fi/test/frequent_items_sketch_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sstream>
 #include <fstream>
 #include <stdexcept>

data/vendor/datasketches-cpp/fi/test/reverse_purge_hash_map_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <reverse_purge_hash_map.hpp>
 

data/vendor/datasketches-cpp/hll/test/AuxHashMapTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <memory>
 #include <stdexcept>
 

data/vendor/datasketches-cpp/hll/test/CouponHashSetTest.cpp

@@ -21,7 +21,7 @@
 #include "CouponHashSet.hpp"
 #include "HllUtil.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <ostream>
 #include <cmath>
 #include <string>

data/vendor/datasketches-cpp/hll/test/CouponListTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <ostream>
 #include <sstream>
 #include <cmath>

data/vendor/datasketches-cpp/hll/test/CrossCountingTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <ostream>
 #include <cmath>
 #include <string>

data/vendor/datasketches-cpp/hll/test/HllArrayTest.cpp

@@ -22,7 +22,7 @@
 #include <exception>
 #include <sstream>
 #include <stdexcept>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 namespace datasketches {
 

data/vendor/datasketches-cpp/hll/test/HllSketchTest.cpp

@@ -21,7 +21,7 @@
 
 #include "hll.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <test_allocator.hpp>
 
 namespace datasketches {

data/vendor/datasketches-cpp/hll/test/HllUnionTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sstream>
 #include <stdexcept>
 

data/vendor/datasketches-cpp/hll/test/IsomorphicTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <cstdio>
 

data/vendor/datasketches-cpp/hll/test/TablesTest.cpp

@@ -19,7 +19,7 @@
 
 #include <stdexcept>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "CubicInterpolation.hpp"
 

data/vendor/datasketches-cpp/hll/test/ToFromByteArrayTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <fstream>
 
 #include "hll.hpp"

data/vendor/datasketches-cpp/kll/test/kll_sketch_custom_type_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sstream>
 
 #include <kll_sketch.hpp>

data/vendor/datasketches-cpp/kll/test/kll_sketch_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <cmath>
 #include <cstring>
 #include <sstream>

data/vendor/datasketches-cpp/kll/test/kll_sketch_validation.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <kll_sketch.hpp>
 #include <kll_helper.hpp>

data/vendor/datasketches-cpp/kll/test/kolmogorov_smirnov_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <random>
 

data/vendor/datasketches-cpp/pyproject.toml

@@ -2,7 +2,6 @@
 requires = ["wheel",
             "setuptools >= 30.3.0",
             "cmake >= 3.16",
-            "pip >= 10.0",
             "pybind11[global] >= 2.6.0"]
 build-backend = "setuptools.build_meta"
 

data/vendor/datasketches-cpp/python/README.md

@@ -76,7 +76,7 @@ The only developer-specific instructions relate to running unit tests.
 
 ### Unit tests
 
-The Python unit tests are run via `tox`, with no arguments, from the project root directory -- not the python subdirectory. Tox creates a temporary virtual environment in which to build and run teh unit tests. In the event you are missing the necessary pacakge, tox may be installed with `python3 -m pip install --upgrade tox`.
+The Python unit tests are run via `tox`, with no arguments, from the project root directory -- not the python subdirectory. Tox creates a temporary virtual environment in which to build and run the unit tests. In the event you are missing the necessary pacakge, tox may be installed with `python3 -m pip install --upgrade tox`.
 
 ## License
 

data/vendor/datasketches-cpp/python/pybind11Path.cmd

@@ -1,3 +1,3 @@
 @echo off
 :: Takes path to the Python interpreter and returns the path to pybind11
-%1 -m pip show pybind11 | %1 -c "import sys,re;[sys.stdout.write(re.sub('^Location:\\s+','',line)) for line in sys.stdin if re.search('^Location:\\s+',line)]"
+%1 -c "import pybind11,sys;sys.stdout.write(pybind11.get_cmake_dir())"

data/vendor/datasketches-cpp/quantiles/test/kolmogorov_smirnov_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <random>
 

data/vendor/datasketches-cpp/quantiles/test/quantiles_compatibility_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <cmath>
 #include <sstream>
 #include <fstream>

data/vendor/datasketches-cpp/quantiles/test/quantiles_sketch_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <cmath>
 #include <sstream>
 #include <fstream>

data/vendor/datasketches-cpp/req/test/req_sketch_custom_type_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sstream>
 
 #include <req_sketch.hpp>

data/vendor/datasketches-cpp/req/test/req_sketch_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <req_sketch.hpp>
 

data/vendor/datasketches-cpp/sampling/test/var_opt_allocation_test.cpp

@@ -22,7 +22,7 @@
 #include <test_type.hpp>
 #include <test_allocator.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <sstream>
 

data/vendor/datasketches-cpp/sampling/test/var_opt_sketch_test.cpp

@@ -19,7 +19,7 @@
 
 #include <var_opt_sketch.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <vector>
 #include <string>

data/vendor/datasketches-cpp/sampling/test/var_opt_union_test.cpp

@@ -19,7 +19,7 @@
 
 #include <var_opt_union.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <vector>
 #include <string>

data/vendor/datasketches-cpp/setup.py

@@ -20,7 +20,6 @@
 
 import os
 import sys
-import sysconfig
 import platform
 import subprocess
 
@@ -81,7 +80,7 @@ class CMakeBuild(build_ext):
 
 setup(
     name='datasketches',
-    version='3.5.0',
+    version='3.5.1',
     author='Apache Software Foundation',
     author_email='dev@datasketches.apache.org',
     description='The Apache DataSketches Library for Python',
@@ -89,7 +88,7 @@ setup(
     url='http://datasketches.apache.org',
     long_description=open('python/README.md').read(),
     long_description_content_type='text/markdown',
-    packages=find_packages('python'), # python pacakges only in this dir
+    packages=find_packages(where='python',exclude=['src','*tests*']), # src not needed if only the.so
     package_dir={'':'python'},
     # may need to add all source paths for sdist packages w/o MANIFEST.in
     ext_modules=[CMakeExtension('datasketches')],

data/vendor/datasketches-cpp/theta/test/theta_a_not_b_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <theta_a_not_b.hpp>
 

data/vendor/datasketches-cpp/theta/test/theta_intersection_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <theta_intersection.hpp>
 

data/vendor/datasketches-cpp/theta/test/theta_jaccard_similarity_test.cpp

@@ -19,7 +19,7 @@
 
 #include <iostream>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "theta_jaccard_similarity.hpp"
 

data/vendor/datasketches-cpp/theta/test/theta_setop_test.cpp

@@ -20,7 +20,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <theta_union.hpp>
 #include <theta_intersection.hpp>
 #include <theta_a_not_b.hpp>

data/vendor/datasketches-cpp/theta/test/theta_sketch_test.cpp

@@ -23,7 +23,7 @@
 #include <vector>
 #include <stdexcept>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <theta_sketch.hpp>
 
 namespace datasketches {

data/vendor/datasketches-cpp/theta/test/theta_union_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <theta_union.hpp>