Added support for macOS

.github/workflows/pypipublish_linux.yml

@@ -6,19 +6,18 @@ on:
 
 jobs:
   deploy:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: 
-          - ubuntu-latest
-        python-version: [3.5, 3.6, 3.7,3.8]
-
-    runs-on: ${{ matrix.os }}
+        python-version: [3.5, 3.6, 3.7, 3.8]
 
     steps:
       - uses: actions/checkout@v2
       - name: Set up submodules
         run: |
-          bash ./ext_source_setup.sh
+          git submodule update --init --recursive
+          rm -rf third_party/differential-privacy/java 
+          rm -rf third_party/differential-privacy/examples/java
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -42,14 +41,19 @@ jobs:
           chmod +x bazel-2.1.0-installer-linux-x86_64.sh
           ./bazel-2.1.0-installer-linux-x86_64.sh --user
           export PATH="$PATH:$HOME/bin"
-      - name: Build pydp lib
-        run: |
-          bash ./build_PyDP.sh
 
       - name: Install python dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r ./requirements_dev.txt
+          pip install twine
+          pip install wheel
+          pip install setuptools
+
+      - name: Build pydp lib
+        run: |
+          bazel build src/python:bindings_test  --verbose_failures
+          rm -f pydp.so
+          cp -f ./bazel-bin/src/bindings/pydp.so ./pydp
 
       - name: Build wheel
         run: |

.github/workflows/pypipublish_osx.yml

@@ -0,0 +1,49 @@
+name: MacOS Package PyPI deploy
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  deploy:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        python-version: [3.5, 3.6, 3.7, 3.8]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up submodules
+        run: |
+          git submodule update --init --recursive
+          rm -rf third_party/differential-privacy/java 
+          rm -rf third_party/differential-privacy/examples/java
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install twine
+          pip install wheel
+          pip install setuptools
+
+      - name: Build pydp lib
+        run: |
+          bazel build src/python:bindings_test  --verbose_failures
+          rm -f pydp.so
+          cp -f ./bazel-bin/src/bindings/pydp.so ./pydp
+
+
+      - name: Build wheel
+        run: |
+          python setup.py bdist_wheel
+
+      - name: Publishing the wheel
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TOKEN }}
+        run: |
+          twine upload --skip-existing dist/*.whl

.github/workflows/style_check.yml

@@ -25,7 +25,6 @@ jobs:
     - name: Install python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r ./requirements_dev.txt
         pip install black
     - name: Black pep8 style
       run: |

.github/workflows/tests.yml

@@ -25,22 +25,29 @@ jobs:
     - name: Install python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r ./requirements_dev.txt
+        pip install coverage
+        pip install wheel
     - name: Set up submodules
       run: |
-        bash ./ext_source_setup.sh
+        git submodule update --init --recursive
+        rm -rf third_party/differential-privacy/java 
+        rm -rf third_party/differential-privacy/examples/java
     - name: Install pre-requisites
       run: |
         sudo apt-get update
-        bash ./prereqs.sh
+        bash ./prereqs_linux.sh
         export PATH="$PATH:$HOME/bin"
     - name: Build pydp lib
       run: |
-        bash ./build_PyDP.sh
+        bazel build src/python:bindings_test  --verbose_failures
+        rm -f pydp.so
+        cp -f ./bazel-bin/src/bindings/pydp.so ./pydp
     - name: Run tests
       run: |
-         python setup.py test
+        pip install pycodestyle
+        pip install pytest
+        python setup.py test
     - name: Check test coverage
       run: |
-         coverage run --source pydp setup.py test
-         coverage report --ignore-errors --fail-under 95 -m
+        coverage run --source pydp setup.py test
+        coverage report --ignore-errors --fail-under 95 -m

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "third_party/differential-privacy"]
 	path = third_party/differential-privacy
 	url = https://github.com/google/differential-privacy
-[submodule "third_party/pybind11_bazel"]
-	path = third_party/pybind11_bazel
-	url = https://github.com/pybind/pybind11_bazel

Dockerfile

@@ -32,21 +32,22 @@ RUN \
 # get third-party dependencies
 WORKDIR /tmp/third_party
 
-RUN git clone https://github.com/google/differential-privacy.git && \
-    git clone https://github.com/pybind/pybind11_bazel.git
+RUN git clone https://github.com/google/differential-privacy.git
+RUN pip3 install pipenv
 
 WORKDIR /root/PyDP
 COPY . /root/PyDP
 
-RUN rm -rf third_party/differential-privacy/ third_party/pybind11_bazel/ && \
+RUN rm -rf third_party/differential-privacy/ && \
     cp -r /tmp/third_party/* /root/PyDP/third_party
 
+RUN rm -rf third_party/differential-privacy/java && \ 
+    rm -rf third_party/differential-privacy/examples/java
 
 RUN \
-    bash build_PyDP.sh && \
-    python3 setup.py sdist bdist_wheel && \
-    pip install dist/*.whl && \
-    pip install -r requirements_dev.txt
+    pipenv run bazel build src/python:bindings_test  --verbose_failures && \
+    pipenv run python3 setup.py bdist_wheel && \
+    pipenv install dist/*.whl
 
 # Define default command.
 CMD ["bash"]

Pipfile

@@ -0,0 +1,15 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+setuptools = "*"
+bumpversion = "==0.5.3"
+tox = "==3.5.2"
+pytest = "*"
+pycodestyle = "*"
+twine = "*"
+coverage = "*"
+
+[packages]