From c02ba86375c4b91fd5f7fb2f5f54091bd0b45a34 Mon Sep 17 00:00:00 2001 From: novavic Date: Sat, 2 May 2020 23:23:51 -0700 Subject: [PATCH 01/45] [#111] Set Up Auto Build and Push to PyPI At some point it should be linked to real PyPI server instead of the test one. Also have to uncomment the `on tag` to rebuild and push only when a new release is tagged/made. --- .travis.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..756002c7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ + +sudo: required +language: python +python: + - '3.5' + - '3.6' + - '3.7' +services: + - docker +install: + - pip3 install -r requirements_dev.txt + - pip3 install wheel +script: + - python3 setup.py tests + - export PYDP_VERSION=$(git tag | tail -n1) + - echo $PYDP_VERSION +deploy: + provider: pypi + user: novavic + server: https://test.pypi.org/legacy/ + distributions: bdist_wheel + dist: python + package_glob: dist/*.whl + #on: + # tags: true + password: + secure: QnFXxNkqP488GMmOFfrgQp5NFT5PHT+UrTOeZ7wEt9apNp//8wiNlbGIty2aGcNJZP2EIHkqaDXe4BIAYaxeEuBITPC9ch3p1PWvxr+q4NesDDpaM1e8yFcktJFZqfXn/R5S2bBqtw+oOzxfS1nVU8PAicCDdGMdnwdlBfOVxjNJa+6YtOyDetPAxsoo46dsjBZSjkdsTIzDuJ70uwsklqF0lGT4rofdRTxvSdg4hHgRnrQEDk5V9AVC8e+XWncytd5a/nc95G6ehhea7Cln3Kic+/8+t1xTtKGB7x/kTDKGkYVdG7JYcphARYgHGKjeyeRb41J/FWIKgchZ5nXBK9ZOxqBUtYWyrFfl350FxGUuK6jGvZP0zeGBJiHOzqerGSrulj8mCUGBJmMgKPuNxkwLgDWPHKnpdDkWz5QClF4F5Of8+Lwhj60IQNrNuk/yJX9as3Y8qDbTHj3hOxEIU3UNkCeHuqAwco1E55iExfRw/AmfnGWvKtM3qUJE9v9BCIE2owQkwFynjDKlJEtG+p0RoO0q1FK+VGqZRmAmxynAmUwW4+1K5sqtyEYmg0zLWFzrhX89Pn7/aJLdXTmHXFfQUs8Clcfjq9g6cziPGh0hRaQaL5oGp+39JOPLbGuU5dytcpBkMTzItEblkqCGTGXNjUBQDoxKYQ6f6T3Tuk4= +notifications: + email: + on_success: never + on_failure: always From 3d5279cf684205008dd56f56af25a01e73b5298f Mon Sep 17 00:00:00 2001 From: novavic Date: Sat, 2 May 2020 23:23:51 -0700 Subject: [PATCH 02/45] [#111] Fixed a Typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 756002c7..90872524 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ install: - pip3 install -r requirements_dev.txt - pip3 install wheel script: - - python3 setup.py tests + - python3 setup.py test - export PYDP_VERSION=$(git tag | tail -n1) - echo $PYDP_VERSION deploy: From 85b7d8ef4e1f49bc54fcd8ea7fa9efbbfc3738ff Mon Sep 17 00:00:00 2001 From: novavic Date: Sat, 2 May 2020 23:23:51 -0700 Subject: [PATCH 03/45] [#111] Trying to Fix Path Issue --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90872524..278a3037 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,13 @@ sudo: required language: python python: - - '3.5' - - '3.6' + #- '3.5' + #- '3.6' - '3.7' services: - docker install: + - export PYTHONPATH=$PYTHONPATH:$(pwd) - pip3 install -r requirements_dev.txt - pip3 install wheel script: From ede93e35be6d064b76cf2150a57fead565d98d8d Mon Sep 17 00:00:00 2001 From: novavic Date: Sun, 3 May 2020 03:05:42 -0700 Subject: [PATCH 04/45] [#111] Cleanup --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 278a3037..beb82ffe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ - -sudo: required language: python python: #- '3.5' @@ -8,7 +6,6 @@ python: services: - docker install: - - export PYTHONPATH=$PYTHONPATH:$(pwd) - pip3 install -r requirements_dev.txt - pip3 install wheel script: From 9cc3aea55537c287f63568a7059ba090226a7a4b Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Thu, 7 May 2020 16:26:21 +0530 Subject: [PATCH 05/45] added pypi publish workflow --- .github/workflows/pypipublish_linux.yml | 51 +++++++++++++++++++++++++ setup.cfg | 2 - 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/pypipublish_linux.yml diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml new file mode 100644 index 00000000..373d627f --- /dev/null +++ b/.github/workflows/pypipublish_linux.yml @@ -0,0 +1,51 @@ +name: Linux Package PyPI deploy + +on: + push: # only for testing + branches: + - pypi + release: + types: [created] + +jobs: + deploy: + strategy: + matrix: + os: + - ubuntu-latest + - macos-latest + python-version: [3.5, 3.6, 3.7] + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Set up submodules + run: | + bash ./ext_source_setup.sh + - name: Install pre-requisites + run: | + sudo apt-get update + bash ./prereqs.sh + export PATH="$PATH:$HOME/bin" + - name: Build pydp lib + run: | + bash ./build_PyDP.sh + + - name: Set up Python ${{ matrix.python-version }} + - uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Install python dependencies + run: | + python -m pip install --upgrade pip + pip install -r ./requirements_dev.txt + + - name: Build and publish + env: + TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: | + python setup.py bdist_wheel + twine upload --skip-existing dist/*.whl + diff --git a/setup.cfg b/setup.cfg index 5670fc62..f6cfb54e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,8 +7,6 @@ tag = True search = version='{current_version}' replace = version='{new_version}' -[bdist_wheel] -universal = 1 [pycodestyle] max-line-length = 88 From 0e83314ff631a11b57c2e2b9a1d97323ecde4c38 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Thu, 7 May 2020 16:29:08 +0530 Subject: [PATCH 06/45] fixed typo --- .github/workflows/pypipublish_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 373d627f..13dd2cd5 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - - name: Install python dependencies + - name: Install python dependencies run: | python -m pip install --upgrade pip pip install -r ./requirements_dev.txt From 99a3e43e2a8ea62faa0be08b48f1b6fb07bd449f Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Thu, 7 May 2020 16:32:11 +0530 Subject: [PATCH 07/45] yet another typo --- .github/workflows/pypipublish_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 13dd2cd5..7fa2033a 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -33,7 +33,7 @@ jobs: bash ./build_PyDP.sh - name: Set up Python ${{ matrix.python-version }} - - uses: actions/setup-python@v1 + uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - name: Install python dependencies From c161f52c7a182d3372c89e1b5bc3bcc4457b73f5 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Thu, 7 May 2020 16:36:36 +0530 Subject: [PATCH 08/45] removed osx --- .github/workflows/pypipublish_linux.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 7fa2033a..776d0235 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -13,7 +13,6 @@ jobs: matrix: os: - ubuntu-latest - - macos-latest python-version: [3.5, 3.6, 3.7] runs-on: ${{ matrix.os }} From 91fa710d6ae142962f73facdf398753c07877735 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Thu, 7 May 2020 16:48:29 +0530 Subject: [PATCH 09/45] moving it to test pypi temp --- .github/workflows/pypipublish_linux.yml | 2 +- requirements_dev.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 776d0235..fcaada6b 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -46,5 +46,5 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | python setup.py bdist_wheel - twine upload --skip-existing dist/*.whl + twine upload --repository-url https://test.pypi.org/legacy --skip-existing dist/*.whl diff --git a/requirements_dev.txt b/requirements_dev.txt index 0cd4333e..3d81f682 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -6,3 +6,4 @@ tox==3.5.2 coverage==4.5.1 pytest pycodestyle +twine From c53abe6458b03f924fb525dfb11db56649b6bdef Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Thu, 7 May 2020 16:58:08 +0530 Subject: [PATCH 10/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index fcaada6b..4dfb89fb 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -46,5 +46,5 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | python setup.py bdist_wheel - twine upload --repository-url https://test.pypi.org/legacy --skip-existing dist/*.whl + twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl From ea739f652d1e6c835c7fb3a4063cdb170dd2aca8 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Fri, 8 May 2020 02:55:33 +0530 Subject: [PATCH 11/45] added many linux --- .github/workflows/pypipublish_linux.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 4dfb89fb..9d5afc6b 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -16,6 +16,8 @@ jobs: python-version: [3.5, 3.6, 3.7] runs-on: ${{ matrix.os }} + container: quay.io/pypa/manylinux2010_x86_64 + steps: - uses: actions/checkout@v2 From af53a2b63fcf2a47c0b243de5ee97a7b727f5cf1 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Fri, 8 May 2020 16:04:01 +0530 Subject: [PATCH 12/45] reformating --- .github/workflows/pypipublish_linux.yml | 2 -- setup.py | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 9d5afc6b..4dfb89fb 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -16,8 +16,6 @@ jobs: python-version: [3.5, 3.6, 3.7] runs-on: ${{ matrix.os }} - container: quay.io/pypa/manylinux2010_x86_64 - steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index b8d176fe..0dc23674 100644 --- a/setup.py +++ b/setup.py @@ -9,10 +9,10 @@ class BinaryDistribution(Distribution): - """This class is needed in order to create OS specific wheels.""" + """This class is needed in order to create OS specific wheels.""" - def has_ext_modules(self): - return True + def has_ext_modules(self): + return True def read(fname): @@ -47,7 +47,7 @@ def read(fname): keywords="pydp", name="python-dp", package_data={"pydp": ["pydp.so"],}, - packages=find_packages(), # need to check this + packages=find_packages(exclude=["tests/"]), # need to check this setup_requires=setup_requirements, test_suite="tests", tests_require=test_requirements, From 9e5bc6e75f62167ef4851f2b75f5b2cd63c19764 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Fri, 8 May 2020 16:22:29 +0530 Subject: [PATCH 13/45] added many linux yet again --- .github/workflows/pypipublish_linux.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 4dfb89fb..1bc6d68b 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -16,9 +16,10 @@ jobs: python-version: [3.5, 3.6, 3.7] runs-on: ${{ matrix.os }} + container: quay.io/pypa/manylinux2010_x86_64 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v1 - name: Set up submodules run: | bash ./ext_source_setup.sh From dc6458f0ba203a3f21a9a9ad2ee7a295b4f235d4 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Fri, 8 May 2020 16:29:08 +0530 Subject: [PATCH 14/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 1bc6d68b..db00f18a 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -25,9 +25,7 @@ jobs: bash ./ext_source_setup.sh - name: Install pre-requisites run: | - sudo apt-get update - bash ./prereqs.sh - export PATH="$PATH:$HOME/bin" + yum install bazel - name: Build pydp lib run: | bash ./build_PyDP.sh From fb62fa8a13613ba7dba4cf2f9f26a77748139c21 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Fri, 8 May 2020 16:42:49 +0530 Subject: [PATCH 15/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index db00f18a..8541d10b 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -16,7 +16,7 @@ jobs: python-version: [3.5, 3.6, 3.7] runs-on: ${{ matrix.os }} - container: quay.io/pypa/manylinux2010_x86_64 + container: quay.io/pypa/manylinux2014_x86_64 steps: - uses: actions/checkout@v1 @@ -25,6 +25,7 @@ jobs: bash ./ext_source_setup.sh - name: Install pre-requisites run: | + wget https://copr.fedorainfracloud.org/coprs/vbatts/bazel/repo/epel-7/vbatts-bazel-epel-7.repo -P /etc/yum.repos.d/ yum install bazel - name: Build pydp lib run: | From b7e66899649b462eba0caa71a120a79140eec251 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Fri, 8 May 2020 16:44:22 +0530 Subject: [PATCH 16/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 8541d10b..a6720e28 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -25,6 +25,7 @@ jobs: bash ./ext_source_setup.sh - name: Install pre-requisites run: | + yum install wget wget https://copr.fedorainfracloud.org/coprs/vbatts/bazel/repo/epel-7/vbatts-bazel-epel-7.repo -P /etc/yum.repos.d/ yum install bazel - name: Build pydp lib From fd20f542ad48bd991295e6e734b506fea0145613 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Fri, 8 May 2020 16:47:49 +0530 Subject: [PATCH 17/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index a6720e28..59bb573d 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -25,9 +25,9 @@ jobs: bash ./ext_source_setup.sh - name: Install pre-requisites run: | - yum install wget + yum -y install wget wget https://copr.fedorainfracloud.org/coprs/vbatts/bazel/repo/epel-7/vbatts-bazel-epel-7.repo -P /etc/yum.repos.d/ - yum install bazel + yum -y install bazel - name: Build pydp lib run: | bash ./build_PyDP.sh From adf3a23964fe6bd8f36efb3e5c9d2c05a3e125ee Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Fri, 8 May 2020 16:59:13 +0530 Subject: [PATCH 18/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 59bb573d..4256a581 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -16,7 +16,7 @@ jobs: python-version: [3.5, 3.6, 3.7] runs-on: ${{ matrix.os }} - container: quay.io/pypa/manylinux2014_x86_64 + container: quay.io/pypa/manylinux2010_x86_64 steps: - uses: actions/checkout@v1 From f4a1d870a04043b5ec720ed08f68db8d6fab544a Mon Sep 17 00:00:00 2001 From: Benardi Date: Sat, 9 May 2020 00:43:51 -0300 Subject: [PATCH 19/45] Add CENTOS 6 compliant bazel build to workflow --- .github/workflows/pypipublish_linux.yml | 108 +++++++++++++++++++++++- 1 file changed, 105 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 4256a581..23d352e2 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -3,7 +3,9 @@ name: Linux Package PyPI deploy on: push: # only for testing branches: - - pypi + - pypi + pull_request: + types: [opened, synchronize, reopened] release: types: [created] @@ -20,14 +22,114 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Check CentOS version + run: | + cat /etc/centos-release + - name: Query available devtoolset + run: | + yum search devtoolset |grep devtoolset|awk {'print $1'} |cut -f 1,2 -d\-|sort|uniq - name: Set up submodules run: | bash ./ext_source_setup.sh - name: Install pre-requisites run: | yum -y install wget - wget https://copr.fedorainfracloud.org/coprs/vbatts/bazel/repo/epel-7/vbatts-bazel-epel-7.repo -P /etc/yum.repos.d/ - yum -y install bazel + + # install environment to build bazel + # adapted from https://github.com/bazelbuild/bazel/wiki/FAQ + # nice to see that they are using my old devtoolset-2 + yum -y install java-1.8.0-openjdk-devel wget which findutils binutils gcc tar gzip zip unzip java java-devel git clang zlib-devel gcc-c++ + + # one should really use the latest devtoolset-N from scl-rh + # to use newer gcc versions + # devtoolset-2-gcc.x86_64 4.8.2-15.el6 @devtools + # devtoolset-3-gcc.x86_64 4.9.2-6.2.el6 @centos-sclo-rh + # devtoolset-4-gcc.x86_64 5.3.1-6.1.el6 @centos-sclo-rh + # devtoolset-6-gcc.x86_64 6.2.1-3.1.el6 @centos-sclo-rh + + + + + yum -y install centos-release-scl-rh + # use the local Pasteur repository for scl-rh too + wget http://people.centos.org/tru/devtools-3/devtools-3.repo -O /etc/yum.repos.d/devtools-3.repo + yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils + + + # Set the path to java and gcc + export JAVA_HOME=/usr/lib/jvm/java-1.8.0 + export CC=/opt/rh/devtoolset-2/root/usr/bin/gcc + + + + # use one of these + #yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils + #yum -y install devtoolset-8-gcc devtoolset-8-gcc-c++ devtoolset-8-binutils + #yum -y install devtoolset-3-gcc devtoolset-6-gcc-c++ devtoolset-3-binutils + + # GPG key + #gpg --recv-key 48457EE0 ; gpg --recv-key 48457EE0 + # yes twice, the 1st time, the config file are generated but not used + #gpg: directory `/root/.gnupg' created + #gpg: new configuration file `/root/.gnupg/gpg.conf' created + #gpg: WARNING: options in `/root/.gnupg/gpg.conf' are not yet active during this run + #gpg: keyring `/root/.gnupg/secring.gpg' created + #gpg: keyring `/root/.gnupg/pubring.gpg' created + #gpg: no keyserver known (use option --keyserver) + #gpg: keyserver receive failed: Syntax error in URI + + # this does not work: + #-------------------- + # wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-installer-linux-x86_64.sh + # wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-installer-linux-x86_64.sh.sig + # gpg --verify bazel-0.4.5-installer-linux-x86_64.sh.sig && sh /bazel-0.4.5-installer-linux-x86_64.sh + # + # yields: + #-------- + # bazel is now installed in /usr/local + # bash completion: source /usr/local/lib/bazel/bin/bazel-complete.bash + # but the provided bazel binary is not working.. + # /usr/local/bin/bazel: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /usr/local/bin/bazel) + # CentOS-6 glibc is glibc-2.12-1.xxxx + + wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-dist.zip + #wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-dist.zip.sig + #gpg --verify bazel-0.4.5-dist.zip.sig && + unzip -d /tmp/bazel-0.4.5-dist bazel-0.4.5-dist.zip && \ + #/bin/rm bazel-0.4.5-dist.zip.sig bazel-0.4.5-dist.zip + /bin/rm bazel-0.4.5-dist.zip + + # enable the new devtoolset + echo 'cd /tmp/bazel-0.4.5-dist && bash ./compile.sh && cp output/bazel /usr/local/bin' | scl enable devtoolset-3 bash + # replace devtoolset-3 by 4/5 if you are using the other versions + + # cleanup + /bin/rm -rf /tmp/bazel-0.4.5-dist + # stop here if you only need bazel (to build tensorflow for instance) + # if you want to build the git version of bazel uncomment the following 2 lines. + #git clone https://github.com/bazelbuild/bazel /tmp/bazel && \ + #cd /tmp/bazel && bazel build //src:bazel && cp bazel-bin/src/bazel /usr/local/bin/bazel.new + + + + + + + + + + + + + + + + + + + + + - name: Build pydp lib run: | bash ./build_PyDP.sh From 27cd53f0648637fb75bbdb372a6a19eb886db19e Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sat, 9 May 2020 12:13:27 +0530 Subject: [PATCH 20/45] added zip installation https://github.com/bazelbuild/bazel/issues/3018#issuecomment-308577562 --- .github/workflows/pypipublish_linux.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 23d352e2..0ea3d454 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -92,6 +92,8 @@ jobs: # /usr/local/bin/bazel: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /usr/local/bin/bazel) # CentOS-6 glibc is glibc-2.12-1.xxxx + # github issue known issue https://github.com/bazelbuild/bazel/issues/3018#issuecomment-308577562 + yum -y install zip unzip wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-dist.zip #wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-dist.zip.sig #gpg --verify bazel-0.4.5-dist.zip.sig && From c8dee93a8a425403028fed6716dc60106d93adf3 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sat, 9 May 2020 12:19:51 +0530 Subject: [PATCH 21/45] moved bazel to 0.9.0 --- .github/workflows/pypipublish_linux.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 0ea3d454..7e824521 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -80,9 +80,9 @@ jobs: # this does not work: #-------------------- - # wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-installer-linux-x86_64.sh - # wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-installer-linux-x86_64.sh.sig - # gpg --verify bazel-0.4.5-installer-linux-x86_64.sh.sig && sh /bazel-0.4.5-installer-linux-x86_64.sh + # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh + # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh.sig + # gpg --verify bazel-0.9.0-installer-linux-x86_64.sh.sig && sh /bazel-0.9.0-installer-linux-x86_64.sh # # yields: #-------- @@ -94,19 +94,20 @@ jobs: # github issue known issue https://github.com/bazelbuild/bazel/issues/3018#issuecomment-308577562 yum -y install zip unzip - wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-dist.zip - #wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel-0.4.5-dist.zip.sig - #gpg --verify bazel-0.4.5-dist.zip.sig && - unzip -d /tmp/bazel-0.4.5-dist bazel-0.4.5-dist.zip && \ - #/bin/rm bazel-0.4.5-dist.zip.sig bazel-0.4.5-dist.zip - /bin/rm bazel-0.4.5-dist.zip + wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip + #wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip.sig + #gpg --verify bazel-0.9.0-dist.zip.sig && + unzip -d /tmp/bazel-0.9.0-dist bazel-0. + -dist.zip && \ + #/bin/rm bazel-0.9.0-dist.zip.sig bazel-0.9.0-dist.zip + /bin/rm bazel-0.9.0-dist.zip # enable the new devtoolset - echo 'cd /tmp/bazel-0.4.5-dist && bash ./compile.sh && cp output/bazel /usr/local/bin' | scl enable devtoolset-3 bash + echo 'cd /tmp/bazel-0.9.0-dist && bash ./compile.sh && cp output/bazel /usr/local/bin' | scl enable devtoolset-3 bash # replace devtoolset-3 by 4/5 if you are using the other versions # cleanup - /bin/rm -rf /tmp/bazel-0.4.5-dist + /bin/rm -rf /tmp/bazel-0.9.0-dist # stop here if you only need bazel (to build tensorflow for instance) # if you want to build the git version of bazel uncomment the following 2 lines. #git clone https://github.com/bazelbuild/bazel /tmp/bazel && \ From 74037b21e77682356acfdfa3d53234875cb2c539 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sat, 9 May 2020 12:26:06 +0530 Subject: [PATCH 22/45] fixed typo --- .github/workflows/pypipublish_linux.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 7e824521..3bccf8cd 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -97,8 +97,7 @@ jobs: wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip #wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip.sig #gpg --verify bazel-0.9.0-dist.zip.sig && - unzip -d /tmp/bazel-0.9.0-dist bazel-0. - -dist.zip && \ + unzip -d /tmp/bazel-0.9.0-dist bazel-0.9.0-dist.zip && \ #/bin/rm bazel-0.9.0-dist.zip.sig bazel-0.9.0-dist.zip /bin/rm bazel-0.9.0-dist.zip From c5dd91c6feafe1f15a7a9428eaae09703bb453c9 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sat, 9 May 2020 12:33:23 +0530 Subject: [PATCH 23/45] added alternate path for devtools-3 --- .github/workflows/pypipublish_linux.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 3bccf8cd..62305b65 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -34,7 +34,7 @@ jobs: - name: Install pre-requisites run: | yum -y install wget - + # install environment to build bazel # adapted from https://github.com/bazelbuild/bazel/wiki/FAQ # nice to see that they are using my old devtoolset-2 @@ -53,6 +53,8 @@ jobs: yum -y install centos-release-scl-rh # use the local Pasteur repository for scl-rh too wget http://people.centos.org/tru/devtools-3/devtools-3.repo -O /etc/yum.repos.d/devtools-3.repo + wget https://copr.fedorainfracloud.org/coprs/rhscl/devtoolset-3/repo/epel-6/rhscl-devtoolset-3-epel-6.repo -P /etc/yum.repos.d/ + yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils From ed20a7e705a3b424420d41b593c4bd941dd3f29f Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sat, 9 May 2020 12:39:15 +0530 Subject: [PATCH 24/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 62305b65..8724e3c3 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -52,7 +52,7 @@ jobs: yum -y install centos-release-scl-rh # use the local Pasteur repository for scl-rh too - wget http://people.centos.org/tru/devtools-3/devtools-3.repo -O /etc/yum.repos.d/devtools-3.repo + # wget http://people.centos.org/tru/devtools-3/devtools-3.repo -O /etc/yum.repos.d/devtools-3.repo wget https://copr.fedorainfracloud.org/coprs/rhscl/devtoolset-3/repo/epel-6/rhscl-devtoolset-3-epel-6.repo -P /etc/yum.repos.d/ yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils From 4f9268e0294780efec6ce99579a8e1adf7730f11 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sat, 9 May 2020 12:53:15 +0530 Subject: [PATCH 25/45] latest version bazel + fixed dependencies --- .github/workflows/pypipublish_linux.yml | 132 +++++++++++++----------- 1 file changed, 69 insertions(+), 63 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 8724e3c3..705c9179 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -35,84 +35,90 @@ jobs: run: | yum -y install wget - # install environment to build bazel - # adapted from https://github.com/bazelbuild/bazel/wiki/FAQ - # nice to see that they are using my old devtoolset-2 - yum -y install java-1.8.0-openjdk-devel wget which findutils binutils gcc tar gzip zip unzip java java-devel git clang zlib-devel gcc-c++ - - # one should really use the latest devtoolset-N from scl-rh - # to use newer gcc versions - # devtoolset-2-gcc.x86_64 4.8.2-15.el6 @devtools - # devtoolset-3-gcc.x86_64 4.9.2-6.2.el6 @centos-sclo-rh - # devtoolset-4-gcc.x86_64 5.3.1-6.1.el6 @centos-sclo-rh - # devtoolset-6-gcc.x86_64 6.2.1-3.1.el6 @centos-sclo-rh + yum -y install http://centos.biz.net.id/7/os/x86_64/Packages/libstdc++-4.8.5-28.el7.i686.rpm + + wget https://copr.fedorainfracloud.org/coprs/vbatts/bazel/repo/epel-7/vbatts-bazel-epel-7.repo -P /etc/yum.repos.d/ + yum -y install bazel + + + # # install environment to build bazel + # # adapted from https://github.com/bazelbuild/bazel/wiki/FAQ + # # nice to see that they are using my old devtoolset-2 + # yum -y install java-1.8.0-openjdk-devel wget which findutils binutils gcc tar gzip zip unzip java java-devel git clang zlib-devel gcc-c++ + + # # one should really use the latest devtoolset-N from scl-rh + # # to use newer gcc versions + # # devtoolset-2-gcc.x86_64 4.8.2-15.el6 @devtools + # # devtoolset-3-gcc.x86_64 4.9.2-6.2.el6 @centos-sclo-rh + # # devtoolset-4-gcc.x86_64 5.3.1-6.1.el6 @centos-sclo-rh + # # devtoolset-6-gcc.x86_64 6.2.1-3.1.el6 @centos-sclo-rh - yum -y install centos-release-scl-rh - # use the local Pasteur repository for scl-rh too - # wget http://people.centos.org/tru/devtools-3/devtools-3.repo -O /etc/yum.repos.d/devtools-3.repo - wget https://copr.fedorainfracloud.org/coprs/rhscl/devtoolset-3/repo/epel-6/rhscl-devtoolset-3-epel-6.repo -P /etc/yum.repos.d/ + # yum -y install centos-release-scl-rh + # # use the local Pasteur repository for scl-rh too + # # wget http://people.centos.org/tru/devtools-3/devtools-3.repo -O /etc/yum.repos.d/devtools-3.repo + # wget https://copr.fedorainfracloud.org/coprs/rhscl/devtoolset-3/repo/epel-6/rhscl-devtoolset-3-epel-6.repo -P /etc/yum.repos.d/ - yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils + # yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils - # Set the path to java and gcc - export JAVA_HOME=/usr/lib/jvm/java-1.8.0 - export CC=/opt/rh/devtoolset-2/root/usr/bin/gcc + # # Set the path to java and gcc + # export JAVA_HOME=/usr/lib/jvm/java-1.8.0 + # export CC=/opt/rh/devtoolset-2/root/usr/bin/gcc - # use one of these - #yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils - #yum -y install devtoolset-8-gcc devtoolset-8-gcc-c++ devtoolset-8-binutils - #yum -y install devtoolset-3-gcc devtoolset-6-gcc-c++ devtoolset-3-binutils + # # use one of these + # #yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils + # #yum -y install devtoolset-8-gcc devtoolset-8-gcc-c++ devtoolset-8-binutils + # #yum -y install devtoolset-3-gcc devtoolset-6-gcc-c++ devtoolset-3-binutils - # GPG key - #gpg --recv-key 48457EE0 ; gpg --recv-key 48457EE0 - # yes twice, the 1st time, the config file are generated but not used - #gpg: directory `/root/.gnupg' created - #gpg: new configuration file `/root/.gnupg/gpg.conf' created - #gpg: WARNING: options in `/root/.gnupg/gpg.conf' are not yet active during this run - #gpg: keyring `/root/.gnupg/secring.gpg' created - #gpg: keyring `/root/.gnupg/pubring.gpg' created - #gpg: no keyserver known (use option --keyserver) - #gpg: keyserver receive failed: Syntax error in URI + # # GPG key + # #gpg --recv-key 48457EE0 ; gpg --recv-key 48457EE0 + # # yes twice, the 1st time, the config file are generated but not used + # #gpg: directory `/root/.gnupg' created + # #gpg: new configuration file `/root/.gnupg/gpg.conf' created + # #gpg: WARNING: options in `/root/.gnupg/gpg.conf' are not yet active during this run + # #gpg: keyring `/root/.gnupg/secring.gpg' created + # #gpg: keyring `/root/.gnupg/pubring.gpg' created + # #gpg: no keyserver known (use option --keyserver) + # #gpg: keyserver receive failed: Syntax error in URI - # this does not work: - #-------------------- - # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh - # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh.sig - # gpg --verify bazel-0.9.0-installer-linux-x86_64.sh.sig && sh /bazel-0.9.0-installer-linux-x86_64.sh - # - # yields: - #-------- - # bazel is now installed in /usr/local - # bash completion: source /usr/local/lib/bazel/bin/bazel-complete.bash - # but the provided bazel binary is not working.. - # /usr/local/bin/bazel: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /usr/local/bin/bazel) - # CentOS-6 glibc is glibc-2.12-1.xxxx + # # this does not work: + # #-------------------- + # # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh + # # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh.sig + # # gpg --verify bazel-0.9.0-installer-linux-x86_64.sh.sig && sh /bazel-0.9.0-installer-linux-x86_64.sh + # # + # # yields: + # #-------- + # # bazel is now installed in /usr/local + # # bash completion: source /usr/local/lib/bazel/bin/bazel-complete.bash + # # but the provided bazel binary is not working.. + # # /usr/local/bin/bazel: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /usr/local/bin/bazel) + # # CentOS-6 glibc is glibc-2.12-1.xxxx - # github issue known issue https://github.com/bazelbuild/bazel/issues/3018#issuecomment-308577562 - yum -y install zip unzip - wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip - #wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip.sig - #gpg --verify bazel-0.9.0-dist.zip.sig && - unzip -d /tmp/bazel-0.9.0-dist bazel-0.9.0-dist.zip && \ - #/bin/rm bazel-0.9.0-dist.zip.sig bazel-0.9.0-dist.zip - /bin/rm bazel-0.9.0-dist.zip + # # github issue known issue https://github.com/bazelbuild/bazel/issues/3018#issuecomment-308577562 + # yum -y install zip unzip + # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip + # #wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip.sig + # #gpg --verify bazel-0.9.0-dist.zip.sig && + # unzip -d /tmp/bazel-0.9.0-dist bazel-0.9.0-dist.zip && \ + # #/bin/rm bazel-0.9.0-dist.zip.sig bazel-0.9.0-dist.zip + # /bin/rm bazel-0.9.0-dist.zip - # enable the new devtoolset - echo 'cd /tmp/bazel-0.9.0-dist && bash ./compile.sh && cp output/bazel /usr/local/bin' | scl enable devtoolset-3 bash - # replace devtoolset-3 by 4/5 if you are using the other versions + # # enable the new devtoolset + # echo 'cd /tmp/bazel-0.9.0-dist && bash ./compile.sh && cp output/bazel /usr/local/bin' | scl enable devtoolset-3 bash + # # replace devtoolset-3 by 4/5 if you are using the other versions - # cleanup - /bin/rm -rf /tmp/bazel-0.9.0-dist - # stop here if you only need bazel (to build tensorflow for instance) - # if you want to build the git version of bazel uncomment the following 2 lines. - #git clone https://github.com/bazelbuild/bazel /tmp/bazel && \ - #cd /tmp/bazel && bazel build //src:bazel && cp bazel-bin/src/bazel /usr/local/bin/bazel.new + # # cleanup + # /bin/rm -rf /tmp/bazel-0.9.0-dist + # # stop here if you only need bazel (to build tensorflow for instance) + # # if you want to build the git version of bazel uncomment the following 2 lines. + # #git clone https://github.com/bazelbuild/bazel /tmp/bazel && \ + # #cd /tmp/bazel && bazel build //src:bazel && cp bazel-bin/src/bazel /usr/local/bin/bazel.new From 8d812d4c19171c896df4ce7898211dd5d40408e9 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 13:38:31 +0530 Subject: [PATCH 26/45] fixed pypi upload using ubuntu --- .github/workflows/pypipublish_linux.yml | 134 +++--------------------- 1 file changed, 15 insertions(+), 119 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 705c9179..7ae16265 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -3,9 +3,7 @@ name: Linux Package PyPI deploy on: push: # only for testing branches: - - pypi - pull_request: - types: [opened, synchronize, reopened] + - pypi release: types: [created] @@ -18,128 +16,17 @@ jobs: python-version: [3.5, 3.6, 3.7] runs-on: ${{ matrix.os }} - container: quay.io/pypa/manylinux2010_x86_64 steps: - - uses: actions/checkout@v1 - - name: Check CentOS version - run: | - cat /etc/centos-release - - name: Query available devtoolset - run: | - yum search devtoolset |grep devtoolset|awk {'print $1'} |cut -f 1,2 -d\-|sort|uniq + - uses: actions/checkout@v2 - name: Set up submodules run: | bash ./ext_source_setup.sh - name: Install pre-requisites run: | - yum -y install wget - - yum -y install http://centos.biz.net.id/7/os/x86_64/Packages/libstdc++-4.8.5-28.el7.i686.rpm - - wget https://copr.fedorainfracloud.org/coprs/vbatts/bazel/repo/epel-7/vbatts-bazel-epel-7.repo -P /etc/yum.repos.d/ - yum -y install bazel - - - # # install environment to build bazel - # # adapted from https://github.com/bazelbuild/bazel/wiki/FAQ - # # nice to see that they are using my old devtoolset-2 - # yum -y install java-1.8.0-openjdk-devel wget which findutils binutils gcc tar gzip zip unzip java java-devel git clang zlib-devel gcc-c++ - - # # one should really use the latest devtoolset-N from scl-rh - # # to use newer gcc versions - # # devtoolset-2-gcc.x86_64 4.8.2-15.el6 @devtools - # # devtoolset-3-gcc.x86_64 4.9.2-6.2.el6 @centos-sclo-rh - # # devtoolset-4-gcc.x86_64 5.3.1-6.1.el6 @centos-sclo-rh - # # devtoolset-6-gcc.x86_64 6.2.1-3.1.el6 @centos-sclo-rh - - - - - # yum -y install centos-release-scl-rh - # # use the local Pasteur repository for scl-rh too - # # wget http://people.centos.org/tru/devtools-3/devtools-3.repo -O /etc/yum.repos.d/devtools-3.repo - # wget https://copr.fedorainfracloud.org/coprs/rhscl/devtoolset-3/repo/epel-6/rhscl-devtoolset-3-epel-6.repo -P /etc/yum.repos.d/ - - # yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils - - - # # Set the path to java and gcc - # export JAVA_HOME=/usr/lib/jvm/java-1.8.0 - # export CC=/opt/rh/devtoolset-2/root/usr/bin/gcc - - - - # # use one of these - # #yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils - # #yum -y install devtoolset-8-gcc devtoolset-8-gcc-c++ devtoolset-8-binutils - # #yum -y install devtoolset-3-gcc devtoolset-6-gcc-c++ devtoolset-3-binutils - - # # GPG key - # #gpg --recv-key 48457EE0 ; gpg --recv-key 48457EE0 - # # yes twice, the 1st time, the config file are generated but not used - # #gpg: directory `/root/.gnupg' created - # #gpg: new configuration file `/root/.gnupg/gpg.conf' created - # #gpg: WARNING: options in `/root/.gnupg/gpg.conf' are not yet active during this run - # #gpg: keyring `/root/.gnupg/secring.gpg' created - # #gpg: keyring `/root/.gnupg/pubring.gpg' created - # #gpg: no keyserver known (use option --keyserver) - # #gpg: keyserver receive failed: Syntax error in URI - - # # this does not work: - # #-------------------- - # # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh - # # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh.sig - # # gpg --verify bazel-0.9.0-installer-linux-x86_64.sh.sig && sh /bazel-0.9.0-installer-linux-x86_64.sh - # # - # # yields: - # #-------- - # # bazel is now installed in /usr/local - # # bash completion: source /usr/local/lib/bazel/bin/bazel-complete.bash - # # but the provided bazel binary is not working.. - # # /usr/local/bin/bazel: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /usr/local/bin/bazel) - # # CentOS-6 glibc is glibc-2.12-1.xxxx - - # # github issue known issue https://github.com/bazelbuild/bazel/issues/3018#issuecomment-308577562 - # yum -y install zip unzip - # wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip - # #wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-dist.zip.sig - # #gpg --verify bazel-0.9.0-dist.zip.sig && - # unzip -d /tmp/bazel-0.9.0-dist bazel-0.9.0-dist.zip && \ - # #/bin/rm bazel-0.9.0-dist.zip.sig bazel-0.9.0-dist.zip - # /bin/rm bazel-0.9.0-dist.zip - - # # enable the new devtoolset - # echo 'cd /tmp/bazel-0.9.0-dist && bash ./compile.sh && cp output/bazel /usr/local/bin' | scl enable devtoolset-3 bash - # # replace devtoolset-3 by 4/5 if you are using the other versions - - # # cleanup - # /bin/rm -rf /tmp/bazel-0.9.0-dist - # # stop here if you only need bazel (to build tensorflow for instance) - # # if you want to build the git version of bazel uncomment the following 2 lines. - # #git clone https://github.com/bazelbuild/bazel /tmp/bazel && \ - # #cd /tmp/bazel && bazel build //src:bazel && cp bazel-bin/src/bazel /usr/local/bin/bazel.new - - - - - - - - - - - - - - - - - - - - - + sudo apt-get update + bash ./prereqs.sh + export PATH="$PATH:$HOME/bin" - name: Build pydp lib run: | bash ./build_PyDP.sh @@ -154,10 +41,19 @@ jobs: pip install -r ./requirements_dev.txt - name: Build and publish + run: | + python setup.py bdist_wheel + + - name: Repairing wheel + run: | + pip install auditwheel==2.0.0 + auditwheel repair --plat manylinux2010_x86_64 dist/*.whl + find . -name '*linux*.whl' -type f -exec bash -c 'mv "$1" "${1/linux/manylinux2010}"' -- {} \; + + - name: Publishing the wheel env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | python setup.py bdist_wheel twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl - From 2ddbf849a749adad5d5db10d4d7e3479567087f3 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 14:39:13 +0530 Subject: [PATCH 27/45] Fixed bug in setup.py wrt shared lib in purelib folder Fixed it as mentioned in https://github.com/google/or-tools/issues/616#issuecomment-371480314 --- setup.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/setup.py b/setup.py index 0dc23674..48e3e6c3 100644 --- a/setup.py +++ b/setup.py @@ -5,8 +5,15 @@ from setuptools import setup, find_packages from setuptools.dist import Distribution +from setuptools.command.install import install + import os +class InstallPlatlib(install): + def finalize_options(self): + install.finalize_options(self) + if self.distribution.has_ext_modules(): + self.install_lib = self.install_platlib class BinaryDistribution(Distribution): """This class is needed in order to create OS specific wheels.""" @@ -48,6 +55,7 @@ def read(fname): name="python-dp", package_data={"pydp": ["pydp.so"],}, packages=find_packages(exclude=["tests/"]), # need to check this + cmdclass={'install': InstallPlatlib}, setup_requires=setup_requirements, test_suite="tests", tests_require=test_requirements, From 6b9250325b320ca0f05267c1911e32a28882ab07 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 14:51:39 +0530 Subject: [PATCH 28/45] the package seems to manylinux1 rather than 2010 --- .github/workflows/pypipublish_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 7ae16265..7f66fb96 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -47,8 +47,8 @@ jobs: - name: Repairing wheel run: | pip install auditwheel==2.0.0 - auditwheel repair --plat manylinux2010_x86_64 dist/*.whl - find . -name '*linux*.whl' -type f -exec bash -c 'mv "$1" "${1/linux/manylinux2010}"' -- {} \; + auditwheel repair --plat manylinux1_x86_64 dist/*.whl + find . -name '*linux*.whl' -type f -exec bash -c 'mv "$1" "${1/linux/manylinux1}"' -- {} \; - name: Publishing the wheel env: From 2fe030d348482c9d0bd02c438789947a496eac33 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 15:09:48 +0530 Subject: [PATCH 29/45] trying out without whl repair --- .github/workflows/pypipublish_linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 7f66fb96..d5f91174 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -3,7 +3,7 @@ name: Linux Package PyPI deploy on: push: # only for testing branches: - - pypi + - pypit release: types: [created] @@ -46,8 +46,8 @@ jobs: - name: Repairing wheel run: | - pip install auditwheel==2.0.0 - auditwheel repair --plat manylinux1_x86_64 dist/*.whl + # pip install auditwheel==2.0.0 + # auditwheel repair --plat manylinux1_x86_64 dist/*.whl find . -name '*linux*.whl' -type f -exec bash -c 'mv "$1" "${1/linux/manylinux1}"' -- {} \; - name: Publishing the wheel From 6ff7f7ca760e3e2bf807f326f6622fd9b8593be3 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 15:16:20 +0530 Subject: [PATCH 30/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index d5f91174..0df2e5ed 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -40,14 +40,12 @@ jobs: python -m pip install --upgrade pip pip install -r ./requirements_dev.txt - - name: Build and publish + - name: Build wheel run: | python setup.py bdist_wheel - - name: Repairing wheel + - name: Renaming wheel run: | - # pip install auditwheel==2.0.0 - # auditwheel repair --plat manylinux1_x86_64 dist/*.whl find . -name '*linux*.whl' -type f -exec bash -c 'mv "$1" "${1/linux/manylinux1}"' -- {} \; - name: Publishing the wheel From c1b7b3fd6560d17c31ae3353632cb1c501c99798 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 15:19:28 +0530 Subject: [PATCH 31/45] fixed typo --- .github/workflows/pypipublish_linux.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 0df2e5ed..dba35e11 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -53,5 +53,4 @@ jobs: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - python setup.py bdist_wheel twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl From b59f49b7bed347f46a42548d219b44557153be84 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 15:32:33 +0530 Subject: [PATCH 32/45] some testing --- .github/workflows/pypipublish_linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index dba35e11..09ea9f24 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -53,4 +53,5 @@ jobs: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | + twine check dist/* twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl From 1ce9104a5cf3b1e94796ea8add42e5c72eba9db2 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 15:53:28 +0530 Subject: [PATCH 33/45] rst rendering --- docs/readme.rst | 54 ++++++++++++++++++++++++++++++++++++++++++++ requirements_dev.txt | 2 +- setup.py | 3 +-- 3 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 docs/readme.rst diff --git a/docs/readme.rst b/docs/readme.rst new file mode 100644 index 00000000..7c09e1d9 --- /dev/null +++ b/docs/readme.rst @@ -0,0 +1,54 @@ +Introduction +============ + +PyDP is a Python wrapper for Google’s `Differential Privacy`_ project. +The library provides a set of ε-differentially private algorithms, which +can be used to produce aggregate statistics over numeric data sets +containing private or sensitive information. + +PyDP is part of the OpenMined community, come join the movement on +`Slack`_. + +Instructions +============ + +If you’d like to contribute to this project please read these +`guidelines`_. + +Usage +----- + +As part of the 0.1.0 dev release, we have managed to port the Private +Mean function (Bounded Mean). Other functions will be released in +further release. + +To install the package: ``pip install python-dp`` + +:: + + import pydp as dp # imports the DP library + + # To calculate the Bounded Mean + # epsilon is a number between 0 and 1 denoting privacy threshold + # It measures the acceptable loss of privacy (with 0 meaning no loss is acceptable) + # If both the lower and upper bounds are specified, + # x = dp.BoundedMean(epsilon: double, lower: int, upper: int) + x = dp.BoundedMean(0.6, 1, 10) + + # If lower and upper bounds are not specified, + # DP library automatically calculates these bounds + # x = dp.BoundedMean(epsilon: double) + x = dp.BoundedMean(0.6) + + # To get the result + # Currently supported data types are integer and float. Future versions will support additional data types + # Refer to examples/carrots.py for an introduction + x.result(input_data: list) + +Known issue: If the privacy budget (epsilon is too less), we get a +StatusOR error in the command line. While this needs to be raised as an +error, right now, it’s just displayed as an error in logs. + +.. _Differential Privacy: https://github.com/google/differential-privacy +.. _Slack: http://slack.openmined.org/ +.. _guidelines: https://github.com/OpenMined/PyDP/blob/master/contributing.md \ No newline at end of file diff --git a/requirements_dev.txt b/requirements_dev.txt index 3d81f682..9f1446ba 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,5 +1,5 @@ setuptools -wheel==0.32.1 +wheels bumpversion==0.5.3 watchdog==0.9.0 tox==3.5.2 diff --git a/setup.py b/setup.py index 48e3e6c3..a9572420 100644 --- a/setup.py +++ b/setup.py @@ -48,8 +48,7 @@ def read(fname): distclass=BinaryDistribution, install_requires=requirements, license="Apache-2.0", - long_description=read("README.md"), - long_description_content_type="text/markdown", + long_description=read("docs/readme.rst"), include_package_data=True, keywords="pydp", name="python-dp", From c66ea8d3ea3e8e44e816fe7239e2ec88cb582447 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 16:00:24 +0530 Subject: [PATCH 34/45] removed wheel version by mistake --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index 9f1446ba..3d81f682 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,5 +1,5 @@ setuptools -wheels +wheel==0.32.1 bumpversion==0.5.3 watchdog==0.9.0 tox==3.5.2 From fe8be6850b6619d082dd790642e37768d3ba185a Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 16:39:51 +0530 Subject: [PATCH 35/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 09ea9f24..f17e91c7 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -3,7 +3,7 @@ name: Linux Package PyPI deploy on: push: # only for testing branches: - - pypit + - pypi release: types: [created] From 6b71f9ccab4fbda54495dfcc06715c57ec9adeb2 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 16:51:50 +0530 Subject: [PATCH 36/45] removed auto python3.6 installation --- .github/workflows/pypipublish_linux.yml | 16 +++++++++++++++- setup.py | 4 +++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index f17e91c7..ebc08ec3 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -25,7 +25,21 @@ jobs: - name: Install pre-requisites run: | sudo apt-get update - bash ./prereqs.sh + # checking for g++ + dpkg -s g++ &> /dev/null + if [ $? -eq 0 ]; then + echo "g++ is installed, skipping..." + else + echo "Installing g++" + sudo apt-get install g++ + fi + echo "Installing Bazel dependencies" + sudo apt-get install pkg-config zip zlib1g-dev unzip + echo "Donwloading Bazel 2.1.0" + wget https://github.com/bazelbuild/bazel/releases/download/2.1.0/bazel-2.1.0-installer-linux-x86_64.sh + + 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: | diff --git a/setup.py b/setup.py index a9572420..1a99b523 100644 --- a/setup.py +++ b/setup.py @@ -9,12 +9,14 @@ import os + class InstallPlatlib(install): def finalize_options(self): install.finalize_options(self) if self.distribution.has_ext_modules(): self.install_lib = self.install_platlib + class BinaryDistribution(Distribution): """This class is needed in order to create OS specific wheels.""" @@ -54,7 +56,7 @@ def read(fname): name="python-dp", package_data={"pydp": ["pydp.so"],}, packages=find_packages(exclude=["tests/"]), # need to check this - cmdclass={'install': InstallPlatlib}, + cmdclass={"install": InstallPlatlib}, setup_requires=setup_requirements, test_suite="tests", tests_require=test_requirements, From 1261baeb14b36471aa410a55c2ba9ef878fad042 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 17:00:22 +0530 Subject: [PATCH 37/45] file version rename --- .github/workflows/pypipublish_linux.yml | 1 - README.md | 2 +- contributing.md | 2 +- docs/readme.rst | 2 +- setup.cfg | 2 +- setup.py | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index ebc08ec3..5ff2369a 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -67,5 +67,4 @@ jobs: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - twine check dist/* twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl diff --git a/README.md b/README.md index dc3d901f..901271ba 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you'd like to contribute to this project please read these [guidelines](https ## Usage -As part of the 0.1.0 dev release, we have managed to port the Private Mean function (Bounded Mean). Other functions will be released in further release. +As part of the 0.1.1 dev release, we have managed to port the Private Mean function (Bounded Mean). Other functions will be released in further release. To install the package: `pip install python-dp` diff --git a/contributing.md b/contributing.md index 22a40263..c6508233 100644 --- a/contributing.md +++ b/contributing.md @@ -55,7 +55,7 @@ $ python3 setup.py sdist bdist_wheel Install wheel: ``` -$ pip install dist/pydp-0.1.0-py2.py3-none-any.whl +$ pip install dist/*.whl ``` ## Docker Support diff --git a/docs/readme.rst b/docs/readme.rst index 7c09e1d9..8d1f5317 100644 --- a/docs/readme.rst +++ b/docs/readme.rst @@ -18,7 +18,7 @@ If you’d like to contribute to this project please read these Usage ----- -As part of the 0.1.0 dev release, we have managed to port the Private +As part of the 0.1.1 dev release, we have managed to port the Private Mean function (Bounded Mean). Other functions will be released in further release. diff --git a/setup.cfg b/setup.cfg index f6cfb54e..5e02149a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.0dev +current_version = 0.1.1dev commit = True tag = True diff --git a/setup.py b/setup.py index 1a99b523..a79db5ee 100644 --- a/setup.py +++ b/setup.py @@ -61,6 +61,6 @@ def read(fname): test_suite="tests", tests_require=test_requirements, url="https://github.com/OpenMined/PyDP", - version="0.1.0", + version="0.1.1", zip_safe=False, ) From ac15750c96a2c1c1234f4d0342886b6380a49b64 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 17:11:38 +0530 Subject: [PATCH 38/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 5ff2369a..b9ca7487 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -43,6 +43,7 @@ jobs: export PATH="$PATH:$HOME/bin" - name: Build pydp lib run: | + echo python -V bash ./build_PyDP.sh - name: Set up Python ${{ matrix.python-version }} From 2676b8d6863180606ef781cb3d7a9b591327d303 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 17:15:06 +0530 Subject: [PATCH 39/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index b9ca7487..04fffa24 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -57,6 +57,7 @@ jobs: - name: Build wheel run: | + echo python -V python setup.py bdist_wheel - name: Renaming wheel From b4cc4572ebe7c2a23099fcc880b2ea4eba0172e5 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 17:17:15 +0530 Subject: [PATCH 40/45] Update pypipublish_linux.yml --- .github/workflows/pypipublish_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 04fffa24..be14ad86 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -43,7 +43,7 @@ jobs: export PATH="$PATH:$HOME/bin" - name: Build pydp lib run: | - echo python -V + python -V bash ./build_PyDP.sh - name: Set up Python ${{ matrix.python-version }} @@ -57,7 +57,7 @@ jobs: - name: Build wheel run: | - echo python -V + python -V python setup.py bdist_wheel - name: Renaming wheel From 9130d0a6717a47e55854748c2d03bf3ca951d74c Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 19:30:35 +0530 Subject: [PATCH 41/45] yet another test --- .github/workflows/pypipublish_linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index be14ad86..68af5d4f 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -44,6 +44,7 @@ jobs: - name: Build pydp lib run: | python -V + python3 -V bash ./build_PyDP.sh - name: Set up Python ${{ matrix.python-version }} From 7afec627d12c105dc3e885724303e9bd85ef6e86 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 19:36:39 +0530 Subject: [PATCH 42/45] moved python setup earlier --- .github/workflows/pypipublish_linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 68af5d4f..6ab3573c 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -22,6 +22,10 @@ jobs: - name: Set up submodules run: | bash ./ext_source_setup.sh + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} - name: Install pre-requisites run: | sudo apt-get update @@ -47,10 +51,6 @@ jobs: python3 -V bash ./build_PyDP.sh - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - name: Install python dependencies run: | python -m pip install --upgrade pip From ca7a65697d1b50d58d5857f5450701d5ec6e82ef Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Sun, 10 May 2020 19:38:04 +0530 Subject: [PATCH 43/45] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a79db5ee..f2e407ee 100644 --- a/setup.py +++ b/setup.py @@ -61,6 +61,6 @@ def read(fname): test_suite="tests", tests_require=test_requirements, url="https://github.com/OpenMined/PyDP", - version="0.1.1", + version="0.1.11", # just testing zip_safe=False, ) From c93df51962b81a68bc1b7c7b5c6cac25c3de36e2 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Mon, 11 May 2020 09:06:41 +0530 Subject: [PATCH 44/45] release ready --- .github/workflows/pypipublish_linux.yml | 14 ++++---------- setup.py | 3 ++- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pypipublish_linux.yml b/.github/workflows/pypipublish_linux.yml index 6ab3573c..498cffac 100644 --- a/.github/workflows/pypipublish_linux.yml +++ b/.github/workflows/pypipublish_linux.yml @@ -1,9 +1,6 @@ name: Linux Package PyPI deploy on: - push: # only for testing - branches: - - pypi release: types: [created] @@ -13,7 +10,7 @@ jobs: matrix: os: - ubuntu-latest - python-version: [3.5, 3.6, 3.7] + python-version: [3.5, 3.6, 3.7,3.8] runs-on: ${{ matrix.os }} @@ -47,8 +44,6 @@ jobs: export PATH="$PATH:$HOME/bin" - name: Build pydp lib run: | - python -V - python3 -V bash ./build_PyDP.sh - name: Install python dependencies @@ -58,7 +53,6 @@ jobs: - name: Build wheel run: | - python -V python setup.py bdist_wheel - name: Renaming wheel @@ -67,7 +61,7 @@ jobs: - name: Publishing the wheel env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + TWINE_USERNAME: "__token__" + TWINE_PASSWORD: ${{ secrets.TOKEN }} run: | - twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl + twine upload --skip-existing dist/*.whl diff --git a/setup.py b/setup.py index f2e407ee..a4272672 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ def read(fname): "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", ], description="Python API for Google's Differential Privacy library", distclass=BinaryDistribution, @@ -61,6 +62,6 @@ def read(fname): test_suite="tests", tests_require=test_requirements, url="https://github.com/OpenMined/PyDP", - version="0.1.11", # just testing + version="0.1.1", zip_safe=False, ) From 31cd91ef4d79cd84411a1a75b036aee05d0dcdd0 Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Mon, 11 May 2020 15:59:59 +0530 Subject: [PATCH 45/45] Delete .travis.yml not needed. --- .travis.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index beb82ffe..00000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: python -python: - #- '3.5' - #- '3.6' - - '3.7' -services: - - docker -install: - - pip3 install -r requirements_dev.txt - - pip3 install wheel -script: - - python3 setup.py test - - export PYDP_VERSION=$(git tag | tail -n1) - - echo $PYDP_VERSION -deploy: - provider: pypi - user: novavic - server: https://test.pypi.org/legacy/ - distributions: bdist_wheel - dist: python - package_glob: dist/*.whl - #on: - # tags: true - password: - secure: QnFXxNkqP488GMmOFfrgQp5NFT5PHT+UrTOeZ7wEt9apNp//8wiNlbGIty2aGcNJZP2EIHkqaDXe4BIAYaxeEuBITPC9ch3p1PWvxr+q4NesDDpaM1e8yFcktJFZqfXn/R5S2bBqtw+oOzxfS1nVU8PAicCDdGMdnwdlBfOVxjNJa+6YtOyDetPAxsoo46dsjBZSjkdsTIzDuJ70uwsklqF0lGT4rofdRTxvSdg4hHgRnrQEDk5V9AVC8e+XWncytd5a/nc95G6ehhea7Cln3Kic+/8+t1xTtKGB7x/kTDKGkYVdG7JYcphARYgHGKjeyeRb41J/FWIKgchZ5nXBK9ZOxqBUtYWyrFfl350FxGUuK6jGvZP0zeGBJiHOzqerGSrulj8mCUGBJmMgKPuNxkwLgDWPHKnpdDkWz5QClF4F5Of8+Lwhj60IQNrNuk/yJX9as3Y8qDbTHj3hOxEIU3UNkCeHuqAwco1E55iExfRw/AmfnGWvKtM3qUJE9v9BCIE2owQkwFynjDKlJEtG+p0RoO0q1FK+VGqZRmAmxynAmUwW4+1K5sqtyEYmg0zLWFzrhX89Pn7/aJLdXTmHXFfQUs8Clcfjq9g6cziPGh0hRaQaL5oGp+39JOPLbGuU5dytcpBkMTzItEblkqCGTGXNjUBQDoxKYQ6f6T3Tuk4= -notifications: - email: - on_success: never - on_failure: always