Skip to content

Commit

Permalink
Update/Fix padawan_trial_1 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
IonesioJunior committed Apr 27, 2023
2 parents 8863024 + cc44a30 commit 52c3d27
Show file tree
Hide file tree
Showing 2,562 changed files with 49,277 additions and 559,740 deletions.
6 changes: 3 additions & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.7.0-beta.62
current_version = 0.8.0
tag = False
tag_name = {new_version}
commit = True
Expand Down Expand Up @@ -30,6 +30,8 @@ first_value = 1

[bumpversion:file:packages/grid/devspace.yaml]

[bumpversion:file:packages/syft/setup.cfg]

[bumpversion:file:packages/syft/src/syft/__init__.py]

[bumpversion:file:packages/syft/src/syft/VERSION]
Expand All @@ -38,6 +40,4 @@ first_value = 1

[bumpversion:file:packages/grid/frontend/package.json]

[bumpversion:file:packages/grid/frontend/src/pages/_domain/login.tsx]

[bumpversion:file:packages/hagrid/hagrid/manifest_template.yml]
28 changes: 21 additions & 7 deletions .github/file-filters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ hagrid:
syft:
- .github/workflows/syft**.yml
- packages/syft/**/*.py
- packages/syft/**/*.proto
- packages/syft/**/*.capnp
- packages/syft/**/*.yml
- packages/syft/**/*.cfg
- packages/syft/**/*.dockerfile
Expand All @@ -65,9 +65,23 @@ frontend:
- "**.mako"
- "**.lock"
- "**.json"
- packages/grid/backend/**/*.eslintrc
- packages/grid/backend/**/*.js
- packages/grid/backend/**/*.json
- packages/grid/backend/**/*.lock
- packages/grid/backend/**/*.ts
- packages/grid/backend/**/*.tsx
- packages/grid/frontend/**/*.eslintrc
- packages/grid/frontend/**/*.js
- packages/grid/frontend/**/*.json
- packages/grid/frontend/**/*.lock
- packages/grid/frontend/**/*.ts
- packages/grid/frontend/**/*.tsx

notebooks:
- .github/workflows/syft-notebook-tests.yml
- notebooks/api/**/*.ipynb
- packages/syft/**/*.py
- packages/syft/**/*.capnp
- packages/syft/**/*.yml
- packages/syft/**/*.cfg
- packages/syft/**/*.dockerfile
- packages/syft/**/*.toml
- packages/syft/**/*.txt
- packages/syft/**/*.ini
- packages/syft/**/*.sh
- packages/syft/**/*.mako
65 changes: 0 additions & 65 deletions .github/workflows/benchmark.yml

This file was deleted.

42 changes: 42 additions & 0 deletions .github/workflows/cd-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: CD - Docs
on:
workflow_dispatch:
inputs:
none:
description: "Deploy Syft Documentation"
required: false
pull_request:
branches: [dev]
paths: [docs/]
push:
branches: [dev]
paths: [docs/]

jobs:
cd-docs:
strategy:
matrix:
python-version: ["3.10"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}

- name: Install tox
run: |
pip install -U tox
- name: Build the docs
run: |
tox -e syft.docs
- name: Deploy the docs
uses: s0/git-publish-subdir-action@develop
env:
REPO: self
BRANCH: gh-pages
FOLDER: docs/build/html
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
80 changes: 80 additions & 0 deletions .github/workflows/cd-hagrid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: CD - HAGrid

on:
schedule:
- cron: "00 03 * * 5" # Thursday
workflow_dispatch:
inputs:
none:
description: "Run hagrid cd manually"
required: false

jobs:
call-hagrid-tests:
if: github.repository == 'OpenMined/PySyft' # don't run on forks
uses: OpenMined/PySyft/.github/workflows/pr-tests-hagrid.yml@dev

deploy-hagrid:
needs: call-hagrid-tests
runs-on: ubuntu-latest

outputs:
current_hash: ${{ steps.get_hash.outputs.current_hash }}
previous_hash: ${{ steps.get_hash.outputs.previous_hash }}
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.SYFT_BUMP_TOKEN }}
- name: Install checksumdir
run: |
pip install --upgrade checksumdir
- name: Get the hashes
id: get-hashes
run: |
current_hash=$(checksumdir ./packages/hagrid)
echo "::set-output name=current_hash::$current_hash"
previous_hash=$(cat ./scripts/hagrid_hash)
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: "3.10"

- name: Install dependencies
if: ${{needs.hagrid-deploy.outputs.current_hash}} != ${{needs.hagrid-deploy.outputs.previous_hash}}
run: |
python -m pip install --upgrade pip
pip install --upgrade tox setuptools wheel twine bump2version PyYAML
- name: Bump the Version
if: ${{needs.hagrid-deploy.outputs.current_hash}} != ${{needs.hagrid-deploy.outputs.previous_hash}}
run: |
python3 hagrid/version.py
python3 scripts/update_manifest.py
bump2version patch --allow-dirty --no-commit
tox -e lint || true
python3 hagrid/version.py
working-directory: ./packages/hagrid

- name: Write the new hash
if: ${{needs.hagrid-deploy.outputs.current_hash}} != ${{needs.hagrid-deploy.outputs.previous_hash}}
run: echo $(checksumdir packages/hagrid) > ./scripts/hagrid_hash

- name: Commit changes
if: ${{needs.hagrid-deploy.outputs.current_hash}} != ${{needs.hagrid-deploy.outputs.previous_hash}}
uses: EndBug/add-and-commit@v7
with:
author_name: Madhava Jay
author_email: [email protected]
message: "bump version"
add: "['./packages/hagrid/.bumpversion.cfg','./packages/hagrid/setup.py','./packages/hagrid/hagrid/version.py', './scripts/hagrid_hash', './packages/hagrid/hagrid/manifest_template.yml']"
pull_strategy: NO-PULL

- name: Build and publish
if: ${{needs.hagrid-deploy.outputs.current_hash}} != ${{needs.hagrid-deploy.outputs.previous_hash}}
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.HAGRID_BUMP_TOKEN }}
run: |
tox -e hagrid.publish
twine upload packages/hagrid/dist/*
Loading

0 comments on commit 52c3d27

Please sign in to comment.