Skip to content

Commit

Permalink
Merge pull request #8263 from OpenMined/rasswanth/prep_0.8.3-beta
Browse files Browse the repository at this point in the history
[WIP]prep 0.8.3 beta
  • Loading branch information
rasswanth-s authored Nov 15, 2023
2 parents 2f7476a + 27c0c8e commit 9d9c19b
Show file tree
Hide file tree
Showing 14 changed files with 40 additions and 40 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/cd-syft.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: CD - Syft

on:
# schedule:
# - cron: "00 12 * * */7" # At 12:00 UTC on every seven days
schedule:
- cron: "00 12 * * */7" # At 12:00 UTC on every seven days

workflow_dispatch:
inputs:
Expand Down Expand Up @@ -261,16 +261,16 @@ jobs:
python -m pip install --upgrade pip
pip install --upgrade tox setuptools wheel twine bump2version PyYAML
# - name: Bump the Version
# id: bump-version
# run: |
# ls **/VERSION | xargs -I {} python {}
# cat packages/grid/devspace.yaml | grep '0\.'
# bump2version prenum --allow-dirty --no-commit
# tox -e lint || true
# ls **/VERSION | xargs -I {} python {}
# cat packages/grid/devspace.yaml | grep '0\.'
# python packages/hagrid/scripts/update_manifest.py $(python packages/grid/VERSION)
- name: Bump the Version
id: bump-version
run: |
ls **/VERSION | xargs -I {} python {}
cat packages/grid/devspace.yaml | grep '0\.'
bump2version prenum --allow-dirty --no-commit
tox -e lint || true
ls **/VERSION | xargs -I {} python {}
cat packages/grid/devspace.yaml | grep '0\.'
python packages/hagrid/scripts/update_manifest.py $(python packages/grid/VERSION)
- name: Check Protocol Version
run: |
Expand Down Expand Up @@ -324,13 +324,13 @@ jobs:
run: |
python scripts/convert_to_pypi_readme.py --input-file packages/syft/README.md --output-file packages/syft/PYPI.md --version ${{ steps.release_checks.outputs.future_stable_version }}
# - name: Commit changes to Syft
# uses: EndBug/add-and-commit@v9
# with:
# author_name: ${{ secrets.OM_BOT_NAME }}
# author_email: ${{ secrets.OM_BOT_EMAIL }}
# message: "[syft]bump version"
# add: "['.bumpversion.cfg', 'VERSION', 'packages/grid/VERSION','packages/syft/PYPI.md', 'packages/grid/devspace.yaml', 'packages/syft/src/syft/VERSION', 'packages/syft/setup.cfg', 'packages/grid/frontend/package.json', 'packages/syft/src/syft/__init__.py', 'packages/hagrid/hagrid/manifest_template.yml', 'packages/grid/helm/syft/Chart.yaml','packages/grid/helm/repo', 'packages/hagrid/hagrid/deps.py', 'packages/grid/podman/podman-kube/podman-syft-kube.yaml' ,'packages/grid/podman/podman-kube/podman-syft-kube-config.yaml', 'packages/syftcli/manifest.yml', 'packages/syft/src/syft/protocol/protocol_version.json']"
- name: Commit changes to Syft
uses: EndBug/add-and-commit@v9
with:
author_name: ${{ secrets.OM_BOT_NAME }}
author_email: ${{ secrets.OM_BOT_EMAIL }}
message: "[syft]bump version"
add: "['.bumpversion.cfg', 'VERSION', 'packages/grid/VERSION','packages/syft/PYPI.md', 'packages/grid/devspace.yaml', 'packages/syft/src/syft/VERSION', 'packages/syft/setup.cfg', 'packages/grid/frontend/package.json', 'packages/syft/src/syft/__init__.py', 'packages/hagrid/hagrid/manifest_template.yml', 'packages/grid/helm/syft/Chart.yaml','packages/grid/helm/repo', 'packages/hagrid/hagrid/deps.py', 'packages/grid/podman/podman-kube/podman-syft-kube.yaml' ,'packages/grid/podman/podman-kube/podman-syft-kube-config.yaml', 'packages/syftcli/manifest.yml', 'packages/syft/src/syft/protocol/protocol_version.json']"

- name: Scheduled Build and Publish
if: github.event_name == 'schedule'
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mono Repo Global Version
__version__ = "0.8.2"
__version__ = "0.8.3-beta.0"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mono Repo Global Version
__version__ = "0.8.2"
__version__ = "0.8.3-beta.0"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ pipelines:
run: |-
run_dependencies --all
ensure_pull_secrets --all
build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2 -t dev-latest
build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.3-beta.0 -t dev-latest
create_deployments --all
vars:
DEVSPACE_ENV_FILE: "default.env"
CONTAINER_REGISTRY: "docker.io"
VERSION: "0.8.2"
VERSION: "0.8.3-beta.0"

# This is a list of `images` that DevSpace can build for this project
# We recommend to skip image building during development (devspace dev) as much as possible
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pygrid-ui",
"version": "0.8.2",
"version": "0.8.3-beta.0",
"private": true,
"scripts": {
"dev": "pnpm i && vite dev --host --port 80",
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/helm/syft/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: syft
description: Perform numpy-like analysis on data that remains in someone elses server
type: application
version: "0.8.2"
appVersion: "0.8.2"
version: "0.8.3-beta.0"
appVersion: "0.8.3-beta.0"
icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png

dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ data:
RABBITMQ_VERSION: 3
SEAWEEDFS_VERSION: 3.55
DOCKER_IMAGE_SEAWEEDFS: chrislusf/seaweedfs:3.55
VERSION: 0.8.2
VERSION: 0.8.3-beta.0
VERSION_HASH: unknown
STACK_API_KEY: ""

Expand Down
4 changes: 2 additions & 2 deletions packages/grid/podman/podman-kube/podman-syft-kube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- configMapRef:
name: podman-syft-config

image: docker.io/openmined/grid-backend:0.8.2
image: docker.io/openmined/grid-backend:0.8.3-beta.0
imagePullPolicy: IfNotPresent
resources: {}
tty: true
Expand All @@ -57,7 +57,7 @@ spec:
envFrom:
- configMapRef:
name: podman-syft-config
image: docker.io/openmined/grid-frontend:0.8.2
image: docker.io/openmined/grid-frontend:0.8.3-beta.0
imagePullPolicy: IfNotPresent
resources: {}
tty: true
Expand Down
2 changes: 1 addition & 1 deletion packages/hagrid/hagrid/deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
from .version import __version__

LATEST_STABLE_SYFT = "0.8.2"
LATEST_BETA_SYFT = "0.8.2"
LATEST_BETA_SYFT = "0.8.2-beta.0"

DOCKER_ERROR = """
You are running an old version of docker, possibly on Linux. You need to install v2.
Expand Down
4 changes: 2 additions & 2 deletions packages/hagrid/hagrid/manifest_template.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
manifestVersion: 0.1
hagrid_version: 0.3.85
syft_version: 0.8.2
dockerTag: 0.8.2
syft_version: 0.8.3-beta.0
dockerTag: 0.8.3-beta.0
baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
hash: d60baa7486ccddb7c13481cefc7215fe3d388289
target_dir: ~/.hagrid/PySyft/
Expand Down
2 changes: 1 addition & 1 deletion packages/syft/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = syft
version = attr: "0.8.2"
version = attr: "0.8.3-beta.0"
description = Perform numpy-like analysis on data that remains in someone elses server
author = OpenMined
author_email = [email protected]
Expand Down
2 changes: 1 addition & 1 deletion packages/syft/src/syft/VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mono Repo Global Version
__version__ = "0.8.2"
__version__ = "0.8.3-beta.0"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
4 changes: 2 additions & 2 deletions packages/syft/src/syft/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.8.2"
__version__ = "0.8.3-beta.0"

# stdlib
import pathlib
Expand Down Expand Up @@ -79,7 +79,7 @@
from .util.util import get_root_data_path # noqa: F401
from .util.version_compare import make_requires

LATEST_STABLE_SYFT = "0.8.2"
LATEST_STABLE_SYFT = "0.8.3-beta.0"
requires = make_requires(LATEST_STABLE_SYFT, __version__)


Expand Down
8 changes: 4 additions & 4 deletions packages/syftcli/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
manifestVersion: 1.0

syftVersion: 0.8.2
dockerTag: 0.8.2
syftVersion: 0.8.3-beta.0
dockerTag: 0.8.3-beta.0

images:
- docker.io/openmined/grid-frontend:0.8.2
- docker.io/openmined/grid-backend:0.8.2
- docker.io/openmined/grid-frontend:0.8.3-beta.0
- docker.io/openmined/grid-backend:0.8.3-beta.0
- docker.io/library/mongo:latest
- docker.io/traefik:v2.10

Expand Down

0 comments on commit 9d9c19b

Please sign in to comment.