From 90b606b5814f767c1be107b520f8ca8d961872d8 Mon Sep 17 00:00:00 2001 From: grilhami Date: Fri, 16 Apr 2021 23:14:51 +0700 Subject: [PATCH 1/8] Change msbuild for windows build test --- .github/workflows/pypipublish_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_windows.yml b/.github/workflows/pypipublish_windows.yml index d619748c..84d4d4b2 100644 --- a/.github/workflows/pypipublish_windows.yml +++ b/.github/workflows/pypipublish_windows.yml @@ -24,7 +24,7 @@ jobs: python -m pip install --upgrade pip python -m pip install setuptools wheel twine auditwheel - name: Setup msbuild - uses: microsoft/setup-msbuild@v1.0.0 + uses: microsoft/setup-msbuild@v1.0.2 - name: Setup Bazel uses: abhinavsingh/setup-bazel@v3 - name: Build PyDP From 94db8628765f890333262d110ca5f614525ac5b0 Mon Sep 17 00:00:00 2001 From: grilhami Date: Fri, 16 Apr 2021 23:45:35 +0700 Subject: [PATCH 2/8] Add "type: ignore" to import in test files - test_rand.py - test_bounded_mean.py - test_distributions.py --- examples/Tutorial_2-restaurant_demo/restaurant.py | 2 +- tests/algorithms/test_bounded_mean.py | 2 +- tests/algorithms/test_distributions.py | 2 +- tests/algorithms/test_rand.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/Tutorial_2-restaurant_demo/restaurant.py b/examples/Tutorial_2-restaurant_demo/restaurant.py index d97fd733..14d9b379 100644 --- a/examples/Tutorial_2-restaurant_demo/restaurant.py +++ b/examples/Tutorial_2-restaurant_demo/restaurant.py @@ -1,5 +1,5 @@ import pydp as dp # type: ignore -from pydp.algorithms.laplacian import BoundedSum, Count # type: ignore +from pydp.algorithms.laplacian import BoundedSum, Count # import math import statistics as s diff --git a/tests/algorithms/test_bounded_mean.py b/tests/algorithms/test_bounded_mean.py index 4210b650..000b92f2 100644 --- a/tests/algorithms/test_bounded_mean.py +++ b/tests/algorithms/test_bounded_mean.py @@ -1,6 +1,6 @@ import os import pytest -from pydp.algorithms.laplacian import BoundedMean +from pydp.algorithms.laplacian import BoundedMean # type: ignore from pydp._pydp import Summary diff --git a/tests/algorithms/test_distributions.py b/tests/algorithms/test_distributions.py index 52d8184b..d904a0d0 100644 --- a/tests/algorithms/test_distributions.py +++ b/tests/algorithms/test_distributions.py @@ -3,7 +3,7 @@ LaplaceDistribution, GaussianDistribution, GeometricDistribution, -) +) # type: ignore import pydp as dp import math from typing import List diff --git a/tests/algorithms/test_rand.py b/tests/algorithms/test_rand.py index 21c67770..acf29fcb 100644 --- a/tests/algorithms/test_rand.py +++ b/tests/algorithms/test_rand.py @@ -1,5 +1,5 @@ import pytest -from pydp.util import Geometric, UniformDouble +from pydp.util import Geometric, UniformDouble # type: ignore def test_rand_UniformDouble(): From b28aac8fd82054671476685fc676fff78a4bac87 Mon Sep 17 00:00:00 2001 From: grilhami Date: Sat, 17 Apr 2021 00:53:30 +0700 Subject: [PATCH 3/8] Add "type: ignore" in imports --- tests/algorithms/test_bounded_mean.py | 2 +- tests/algorithms/test_distributions.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/algorithms/test_bounded_mean.py b/tests/algorithms/test_bounded_mean.py index 000b92f2..310c337b 100644 --- a/tests/algorithms/test_bounded_mean.py +++ b/tests/algorithms/test_bounded_mean.py @@ -1,7 +1,7 @@ import os import pytest from pydp.algorithms.laplacian import BoundedMean # type: ignore -from pydp._pydp import Summary +from pydp._pydp import Summary # type: ignore expect_near = lambda expected, actual, tol: ( diff --git a/tests/algorithms/test_distributions.py b/tests/algorithms/test_distributions.py index d904a0d0..812f981a 100644 --- a/tests/algorithms/test_distributions.py +++ b/tests/algorithms/test_distributions.py @@ -1,9 +1,9 @@ import pytest from pydp.distributions import ( - LaplaceDistribution, - GaussianDistribution, - GeometricDistribution, -) # type: ignore + LaplaceDistribution, # type: ignore + GaussianDistribution, # type: ignore + GeometricDistribution, # type: ignore +) import pydp as dp import math from typing import List From a09868fef86676556b8543cf36f5a506c30e80cb Mon Sep 17 00:00:00 2001 From: grilhami Date: Sat, 17 Apr 2021 01:22:30 +0700 Subject: [PATCH 4/8] Changed back msbuild version to 1.0.0 --- .github/workflows/pypipublish_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_windows.yml b/.github/workflows/pypipublish_windows.yml index 84d4d4b2..d619748c 100644 --- a/.github/workflows/pypipublish_windows.yml +++ b/.github/workflows/pypipublish_windows.yml @@ -24,7 +24,7 @@ jobs: python -m pip install --upgrade pip python -m pip install setuptools wheel twine auditwheel - name: Setup msbuild - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.0.0 - name: Setup Bazel uses: abhinavsingh/setup-bazel@v3 - name: Build PyDP From ef47402349e8c3867c24b4ea808f8f77b6b67a72 Mon Sep 17 00:00:00 2001 From: grilhami Date: Sat, 17 Apr 2021 01:31:13 +0700 Subject: [PATCH 5/8] Test steps chagne for msbuild --- .github/workflows/pypipublish_windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypipublish_windows.yml b/.github/workflows/pypipublish_windows.yml index d619748c..9dd4054f 100644 --- a/.github/workflows/pypipublish_windows.yml +++ b/.github/workflows/pypipublish_windows.yml @@ -15,6 +15,8 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Setup msbuild + uses: microsoft/setup-msbuild@v1.0.0 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: @@ -23,8 +25,6 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install setuptools wheel twine auditwheel - - name: Setup msbuild - uses: microsoft/setup-msbuild@v1.0.0 - name: Setup Bazel uses: abhinavsingh/setup-bazel@v3 - name: Build PyDP From 77c8fbfcec02376d6295dd85c495e4a880585c66 Mon Sep 17 00:00:00 2001 From: grilhami Date: Mon, 19 Apr 2021 02:35:57 +0700 Subject: [PATCH 6/8] Modified msbuild setup to 1.0.2 --- .github/workflows/pypipublish_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_windows.yml b/.github/workflows/pypipublish_windows.yml index 9dd4054f..52788600 100644 --- a/.github/workflows/pypipublish_windows.yml +++ b/.github/workflows/pypipublish_windows.yml @@ -16,7 +16,7 @@ jobs: with: submodules: true - name: Setup msbuild - uses: microsoft/setup-msbuild@v1.0.0 + uses: microsoft/setup-msbuild@v1.0.2 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: From 64e4c5a4c3ffdcc1d974a576b35525d22f2efded Mon Sep 17 00:00:00 2001 From: grilhami Date: Wed, 21 Apr 2021 00:02:30 +0700 Subject: [PATCH 7/8] Test changing workflow file name --- .../{pypipublish_windows.yml => pypipublish_windows_1.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{pypipublish_windows.yml => pypipublish_windows_1.yml} (100%) diff --git a/.github/workflows/pypipublish_windows.yml b/.github/workflows/pypipublish_windows_1.yml similarity index 100% rename from .github/workflows/pypipublish_windows.yml rename to .github/workflows/pypipublish_windows_1.yml From 6203aa6f5b5203267a896700571ad56758e2915e Mon Sep 17 00:00:00 2001 From: grilhami Date: Wed, 21 Apr 2021 00:11:18 +0700 Subject: [PATCH 8/8] Renamed back windows build workflow filename --- .../{pypipublish_windows_1.yml => pypipublish_windows.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{pypipublish_windows_1.yml => pypipublish_windows.yml} (100%) diff --git a/.github/workflows/pypipublish_windows_1.yml b/.github/workflows/pypipublish_windows.yml similarity index 100% rename from .github/workflows/pypipublish_windows_1.yml rename to .github/workflows/pypipublish_windows.yml index 52788600..84d4d4b2 100644 --- a/.github/workflows/pypipublish_windows_1.yml +++ b/.github/workflows/pypipublish_windows.yml @@ -15,8 +15,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: Setup msbuild - uses: microsoft/setup-msbuild@v1.0.2 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: @@ -25,6 +23,8 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install setuptools wheel twine auditwheel + - name: Setup msbuild + uses: microsoft/setup-msbuild@v1.0.2 - name: Setup Bazel uses: abhinavsingh/setup-bazel@v3 - name: Build PyDP