PYTHON-2691 Add Windows support (#42)

Author: blink1073

.github/workflows/release-python-osx.yml renamed to .github/workflows/release-python.yml

@@ -5,12 +5,11 @@ on:
   pull_request:
 
 jobs:
-  # MacOS
-  build-osx-wheels:
+  build-non-linux-wheels:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15]
+        os: [macos-10.15, windows-latest]
         python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
     name: Build CPython ${{ matrix.python-version }}-${{ matrix.os }}
     steps:
@@ -20,20 +19,21 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Build wheels
+        working-directory: ./bindings/python
+        shell: bash
         run: |
           ./release.sh
-        working-directory: ./bindings/python
       - uses: actions/upload-artifact@v2
         with:
           name: pymongoarrow-${{ matrix.python-version }}-${{ matrix.os }}-wheel
           path: ./bindings/python/dist/*.whl
           if-no-files-found: error
-  test-osx-wheels:
-    needs: build-osx-wheels
+  test-non-linux-wheels:
+    needs: build-non-linux-wheels
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15]
+        os: [macos-10.15, windows-latest]
         python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
     name: Test CPython ${{ matrix.python-version }}-${{ matrix.os }}
     steps:
@@ -46,6 +46,7 @@ jobs:
         with:
           name: pymongoarrow-${{ matrix.python-version }}-${{ matrix.os }}-wheel
       - name: Test wheel
+        shell: bash
         run: |
           python -m pip install -U pip
           python -m pip install *.whl
@@ -63,9 +64,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build wheels
+        working-directory: ./bindings/python
         run: |
           docker run --rm --volume `pwd`:/python --workdir /python --env PLAT=${{ matrix.container }} --env PYTHON_BINARY=/opt/python/${{ matrix.python-version }}/bin/python quay.io/pypa/${{ matrix.container }} ./release.sh
-        working-directory: ./bindings/python
       - uses: actions/upload-artifact@v2
         with:
           name: pymongoarrow-${{ matrix.python-version }}-${{ matrix.container }}-wheel
@@ -91,12 +92,12 @@ jobs:
   # Collect all built wheels
   collect-wheels:
     runs-on: ubuntu-latest
-    needs: [build-osx-wheels, build-manylinux-wheels]
+    needs: [build-non-linux-wheels, build-manylinux-wheels]
     name: Download Wheels
     steps:
       - name: Download all workflow run artifacts
         uses: actions/download-artifact@v2
       - uses: actions/upload-artifact@v2
         with:
           name: nix-wheels
-          path: "*-wheel"
+          path: "*-wheel"

.github/workflows/test-python.yml

@@ -7,27 +7,43 @@ on:
 defaults:  
   run:  
     working-directory: ./bindings/python
+    shell: bash
 
 jobs:
   build:
     # supercharge/mongodb-github-action requires containers so we don't test other platforms
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: ["ubuntu-20.04", "macos-latest", "windows-latest"]
         python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+      fail-fast: false
     name: CPython ${{ matrix.python-version }}-${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Start MongoDB
+      - name: Start MongoDB on Linux
+        if: ${{ startsWith(runner.os, 'Linux') }}
         uses: supercharge/[email protected]
         with:
           mongodb-version: 4.4
           mongodb-replica-set: test-rs
+      - name: Start MongoDB on MacOS
+        if: ${{ startsWith(runner.os, 'macOS') }}
+        run: |
+          mkdir data
+          mongod --fork --dbpath=$(pwd)/data --logpath=$PWD/mongo.log
+      - name: Start MongoDB on Windows
+        if: ${{ startsWith(runner.os, 'Windows') }}
+        shell: powershell
+        run: |
+          mkdir data
+          mongod --remove
+          mongod --install --dbpath=$(pwd)/data --logpath=$PWD/mongo.log
+          net start MongoDB
       - name: Install libbson
         run: |
           LIBBSON_INSTALL_DIR=$(pwd)/libbson ./build-libbson.sh

bindings/python/.gitignore

@@ -37,3 +37,7 @@ MANIFEST
 
 # Sphinx documentation
 docs/_build/
+
+# libbson files
+libbson
+mongo-c-driver-*

bindings/python/MANIFEST.in

@@ -17,6 +17,8 @@ global-exclude *.cpp
 global-exclude *.dylib
 global-exclude *.so.*
 global-exclude *.so
+global-exclude *.dll
+global-exclude *.pyd
 global-exclude *.pyc
 global-exclude .git*
 global-exclude .DS_Store

bindings/python/README.rst

@@ -49,22 +49,22 @@ PyMongoArrow is available on PyPI::
 To use PyMongoArrow with MongoDB Atlas' ``mongodb+srv://`` URIs, you will
 need to also install PyMongo with the ``srv`` extra::
 
-  $ python -m pip install 'pymongo[srv]<4' pymongoarrow
+  $ python -m pip install 'pymongo[srv]' pymongoarrow
 
 To use PyMongoArrow APIs that return query result sets as pandas
 DataFrame instances, you will also need to have the ``pandas`` package
 installed::
 
      $ python -m pip install pandas
 
-Currently, PyMongoArrow wheels are only available for macOS and Linux
-on x86_64 architectures.
-
 Development Install
 ===================
 
-See the instructions on `Read the Docs <https://mongo-arrow.readthedocs.io/en/latest/developer/installation.html>`_.
+See the instructions on `Read the Docs`_.
 
 Documentation
 =============
-Full documentation is available on `Read the Docs <https://mongo-arrow.readthedocs.io/en/latest/>`_.
+Full documentation is available on `Read the Docs`_.
+
+
+.. _Read the Docs: https://mongo-arrow.readthedocs.io/en/latest

bindings/python/pyproject.toml

@@ -6,10 +6,3 @@ requires = [
     # Must be kept in sync with the `install_requires` in `setup.cfg`
     "pyarrow>=6.0.0,<6.1.0",
 ]
-
-[tool.check-manifest]
-ignore = [
-    "pymongoarrow/*.so*.*", 
-    "pymongoarrow/*.so*", 
-    "pymongoarrow/*.dylib"
-]

bindings/python/release.sh

@@ -10,33 +10,22 @@ then
   exit 1
 fi
 
-# Build libbson binaries in $(pwd)/libbson
-LIBBSON_INSTALL_DIR="$(pwd)/libbson"
-
 # Platform-dependent actions:
-# - Compute shared library name
-# - Set Python runtime to use
-if [ "Darwin" = "$(uname -s)" ]
-then
-  LIBBSON_SO="libbson-1.0.0.dylib"
-  PYTHON=${PYTHON_BINARY:-"python"}
-elif [ "Linux" = "$(uname -s)" ]
+PYTHON=${PYTHON_BINARY:-"python"}
+if [ "Linux" = "$(uname -s)" ]
 then
-  LIBBSON_SO="libbson-1.0.so.0"
   PYTHON=${PYTHON_BINARY:-"python3"}
-else
-  echo "Unsupported platform"
 fi
 
+# Build libbson binaries in $(pwd)/libbson
+LIBBSON_INSTALL_DIR="$(pwd)/libbson"
+
 # Build libbson
 LIBBSON_INSTALL_DIR="$LIBBSON_INSTALL_DIR" LIBBSON_VERSION=${LIBBSON_VERSION:-""} ./build-libbson.sh
 
 # Print Python version used
 $PYTHON --version
 
-# Vendor libbson shared library in PyMongoArrow wheels
-cp $LIBBSON_INSTALL_DIR/lib*/$LIBBSON_SO "$(pwd)/pymongoarrow/"
-
 # Install build dependencies
 $PYTHON -m pip install -U pip build
 

bindings/python/setup.cfg

@@ -39,7 +39,7 @@ install_requires =
     pymongo >=3.11,<5
 
 [options.package_data]
-pymongoarrow = *.pxd, *.pyx, *.pyi, *.so.*, *.dylib
+pymongoarrow = *.pxd, *.pyx, *.pyi, *.so.*, *.dylib, *.dll, *.pyd
 
 [options.packages.find]
 exclude =