Merge pull request #308 from apache/3.5.1

3.5.1

Author: jmalkin

.github/workflows/build_cmake.yml

@@ -55,6 +55,6 @@ jobs:
         with:
           python-version: '3.8' # 3.x grabs latest minor version of python3, but 3.9 not fully supported yet
       - name: Install Python dependencies
-        run: python -m pip install --upgrade pip setuptools wheel numpy tox pytest
+        run: python -m pip install --upgrade pip setuptools wheel tox
       - name: Build and run Python tests
         run: python -m tox

.github/workflows/build_wheels.yml

@@ -37,22 +37,36 @@ jobs:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
     strategy:
-      fail-fast: false
+      #fail-fast: false
       matrix:
         config:
         - {
-            name: "MacOS 10.15",
-            os: macos-latest
+            name: "MacOS Latest (Intel)",
+            os: macos-latest,
+            cibw-arch: macosx_x86_64
           }
         - {
-            name: "Ubuntu Latest",
-            os: ubuntu-latest
+            name: "MacOS Latest (Apple Silicon)",
+            os: macos-latest,
+            cibw-arch: macosx_arm64
+          }
+        - {
+            name: "Ubuntu Latest (x86_64)",
+            os: ubuntu-latest,
+            cibw-arch: manylinux_x86_64
+          }
+        - {
+            name: "Ubuntu Latest (i686)",
+            os: ubuntu-latest,
+            cibw-arch: manylinux_i686
           }
         - {
             name: "Windows Latest",
-            os: windows-latest
+            os: windows-latest,
+            cibw-arch: win_amd64
           }
-            
+
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -65,12 +79,20 @@ jobs:
       - name: Install Python dependencies
         run: python -m pip install cibuildwheel==2.5.0
 
+      - name: Configure cibuildwheel
+        shell: bash
+        run: |
+          CMAKE_OSX_ARCHITECTURES=${{ matrix.config.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.config.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.config.cibw-arch == 'macosx_universal2' && '"arm64;x86_64"' || '' }}
+          echo "CIBW_ARCHS_MACOS=x86_64 arm64" >> $GITHUB_ENV
+          echo "CIBW_BUILD=*-${{ matrix.config.cibw-arch }}" >> $GITHUB_ENV
+          echo "CIBW_ENVIRONMENT_MACOS=CMAKE_OSX_ARCHITECTURES=\"$CMAKE_OSX_ARCHITECTURES\"" >> $GITHUB_ENV
+        
       - name: Build wheels
         run: python -m cibuildwheel --output-dir dist
         env:
-          CIBW_BEFORE_BUILD: python -m pip install cmake>=3.18
+          CIBW_BEFORE_BUILD_LINUX: "yum remove -y cmake"
+          CIBW_BEFORE_BUILD: "python -m pip install cmake>=3.18"
           CIBW_SKIP: "*-win32 pp*-macosx*"
-          CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"
 
       - uses: actions/upload-artifact@v2
         with:

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.
 
 
     =============================================================

MANIFEST.in

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

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
-)
+)