Skip to content

Commit

Permalink
Merge branch 'zenml-io:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
kabinja authored Jan 18, 2024
2 parents d7e58bc + 5558fb0 commit a871adc
Show file tree
Hide file tree
Showing 270 changed files with 6,082 additions and 6,230 deletions.
21 changes: 10 additions & 11 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
name: Bug Report
description: File a bug report
title: "[BUG]: "
labels: ["bug"]
title: '[BUG]: '
labels: [bug]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: contact
attributes:
Expand All @@ -16,16 +16,16 @@ body:
placeholder: [email protected]
validations:
required: false

- type: textarea
id: system-information
attributes:
label: System Information
description: zenml info -a -s
placeholder: "Copy paste the output of the above command here. If using ZenML < 0.36.0, then remove the `-s` flag above. If using ZenML version < 0.8.0, then paste in Python version, OS, ZenML version, and installed integrations."
placeholder: Copy paste the output of the above command here. If using ZenML
< 0.36.0, then remove the `-s` flag above. If using ZenML version < 0.8.0,
then paste in Python version, OS, ZenML version, and installed integrations.
validations:
required: true

- type: textarea
id: what-happened
attributes:
Expand All @@ -34,27 +34,26 @@ body:
placeholder: A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
id: reproduce
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through it step by step."
description: How do you trigger this bug? Please walk us through it step by
step.
value: |
1.
2.
3.
...
validations:
required: false

- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
description: Please copy and paste any relevant log output. This will be automatically
formatted into code, so no need for backticks.
render: shell

- type: checkboxes
id: terms
attributes:
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
blank_issues_enabled: true
contact_links:
- name: Feature Request
Expand Down
64 changes: 29 additions & 35 deletions .github/actions/setup_environment/action.yml
Original file line number Diff line number Diff line change
@@ -1,81 +1,75 @@
name: "Install ZenML"
description: "Install ZenML, most integrations, loads/uploads cached venv and pip download cache if applicable"
---
name: Install ZenML
description: Install ZenML, most integrations, loads/uploads cached venv and pip download
cache if applicable
inputs:
cache_version:
description: 'Value gets appended to the cache key and will therefore invalidate the cache if it changes'
description: Value gets appended to the cache key and will therefore invalidate
the cache if it changes
required: true
python-version:
description: 'Python version'
description: Python version
type: string
required: true
os:
description: 'OS'
description: OS
type: string
required: true
install_integrations:
description: 'Install ZenML integrations'
description: Install ZenML integrations
type: string
required: false
default: 'yes'
runners_cache_access_key_id:
description: 'Runner cache AWS access key ID'
description: Runner cache AWS access key ID
required: true
runners_cache_secret_access_key:
description: 'Runner cache AWS secret access key'
description: Runner cache AWS secret access key
required: true


runs:
using: "composite"
using: composite
steps:
- name: Set up Python
uses: actions/[email protected]
with:
python-version: ${{ inputs.python-version }}

- name: Delete error-causing bash
shell: bash
if: ${{ inputs.os == 'windows-latest' }}
run: rm.exe "C:/WINDOWS/system32/bash.EXE"

- name: Set path to bash for example runner
shell: bash
if: ${{ inputs.os == 'windows-latest' }}
run: |
echo "SHELL_EXECUTABLE=C:\Program Files\Git\bin\bash.exe" >> $GITHUB_ENV
- name: Configure git (non-Windows)
if: ${{ inputs.os != 'windows-latest' }}
shell: bash
run: |
git config --global user.email "[email protected]"
git config --global user.name "ZenML GmbH"
- name: Configure git (Windows)
if: ${{ inputs.os == 'windows-latest' }}
shell: bash
run: |
"C:\Program Files\Git\bin\git.exe" config --global user.email "[email protected]"
"C:\Program Files\Git\bin\git.exe" config --global user.name "ZenML GmbH"
- name: Get current week
shell: bash
id: date
run: echo "::set-output name=week::$(date +'calendar-week-%W')"


- uses: syphar/restore-virtualenv@v1
if : ${{ inputs.os != 'ubuntu-dind-runners' }}
if: ${{ inputs.os != 'ubuntu-dind-runners' }}
id: cache-virtualenv
with:
requirement_files: 'pyproject.toml'
requirement_files: pyproject.toml
# The virtualenv cache is invalidated when:
# - manually triggered by means of a custom cache version token
# - on a weekly basis
# - any of the integration requirements change (a hash of the
# __init__.py files is included in the cache key)
custom_cache_key_element: ${{ inputs.cache_version }}-${{steps.date.outputs.week}}-${{inputs.install_integrations}}-${{ hashFiles('src/zenml/integrations/*/__init__.py') }}

custom_cache_key_element: ${{ inputs.cache_version }}-${{steps.date.outputs.week}}-${{inputs.install_integrations}}-${{
hashFiles('src/zenml/integrations/*/__init__.py') }}
- uses: tespkg/actions-cache@v1
if: ${{ inputs.os == 'ubuntu-dind-runners' }}
id: custom-cache-pip
Expand All @@ -84,10 +78,12 @@ runs:
AWS_SECRET_ACCESS_KEY: ${{ inputs.runners_cache_secret_access_key }}
with:
endpoint: minio-service.minio.svc.cluster.local # optional
insecure: true # optional, use http instead of https. default false
bucket: "caching" # required
use-fallback: false # optional, use github actions cache fallback, default false
key: ${{ inputs.os }}-${{ inputs.cache_version }}-${{ inputs.python-version }}-${{steps.date.outputs.week}}-${{inputs.install_integrations}}-${{ hashFiles('src/zenml/integrations/*/__init__.py') }}
insecure: true # optional, use http instead of https. default false
bucket: caching # required
use-fallback: false # optional, use github actions cache fallback, default false
key: ${{ inputs.os }}-${{ inputs.cache_version }}-${{ inputs.python-version
}}-${{steps.date.outputs.week}}-${{inputs.install_integrations}}-${{ hashFiles('src/zenml/integrations/*/__init__.py')
}}
path: |
~/.cache/pip
restore-keys: |
Expand All @@ -97,38 +93,36 @@ runs:
# - uses: syphar/restore-pip-download-cache@v1
# with:
# requirement_files: 'pyproject.toml'
# # The pip download cache can be updated on a weekly basis as new packages
# # don't appear that often
# # The pip download cache can be updated on a weekly basis as new packages
# # don't appear that often
# custom_cache_key_element: ${{ inputs.cache_version }}-${{ inputs.python-version }}-${{steps.date.outputs.week}}

- name: Install Terraform (Windows)
if: ${{ inputs.os == 'windows-latest' }}
shell: bash
run: choco install terraform -y

- name: Install Terraform (Mac)
if: ${{ inputs.os == 'macos-latest' }}
shell: bash
run: |
brew tap hashicorp/tap
brew install hashicorp/tap/terraform
- name: Install ZenML and dependencies
if: steps.cache-virtualenv.outputs.cache-hit != 'true' && steps.custom-cache-pip.outputs.cache-hit != 'true'
if: steps.cache-virtualenv.outputs.cache-hit != 'true' && steps.custom-cache-pip.outputs.cache-hit
!= 'true'
shell: bash
run: |
scripts/install-zenml-dev.sh --integrations ${{ inputs.install_integrations }}
# if using a cached virtualenv, just refresh the ZenML installation
- name: Refresh ZenML installation
if: steps.cache-virtualenv.outputs.cache-hit == 'true' || steps.custom-cache-pip.outputs.cache-hit == 'true'
if: steps.cache-virtualenv.outputs.cache-hit == 'true' || steps.custom-cache-pip.outputs.cache-hit
== 'true'
shell: bash
run: |
scripts/install-zenml-dev.sh --integrations ${{ inputs.install_integrations }}
- name: Check Python environment
shell: bash
run: |
run: |-
zenml integration list
pip list
pip check || true
9 changes: 5 additions & 4 deletions .github/branch-labels.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
enhancement: 'feature/*'
bug: ['bugfix/*', 'bug/*']
backport: 'backport/*'
documentation: ['documentation/*', 'docs/*']
---
enhancement: feature/*
bug: [bugfix/*, bug/*]
backport: backport/*
documentation: [documentation/*, docs/*]
12 changes: 5 additions & 7 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
---
codecov:
branch: main

comment: false # don't comment on PRs
comment: false # don't comment on PRs
github_checks: false

coverage:
status:
project:
default:
threshold: 1% # allow coverage to drop by 1% before failing the PR

patch: off
threshold: 1% # allow coverage to drop by 1% before failing the PR
patch: false

# do not run coverage on changes
changes: off
changes: false
24 changes: 11 additions & 13 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
---
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "tuesday"
time: "09:00"
timezone: "Europe/Amsterdam"
reviewers:
- "strickvl"
labels:
- "dependencies"
- "internal"
target-branch: "develop"
- package-ecosystem: github-actions
directory: /.github
schedule:
interval: weekly
day: tuesday
time: "07:00"
timezone: Europe/Amsterdam
reviewers: [strickvl]
labels: [dependencies, internal]
target-branch: develop
4 changes: 3 additions & 1 deletion .github/teams.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
internal:
- '@htahir1'
- '@hamza-zenml'
Expand All @@ -11,10 +12,11 @@ internal:
- '@AlexejPenner'
- '@stefannica'
- '@jwwwb'
- '@wjayesh'
- '@wjayesh'
- '@ayush714'
- '@safoinme'
- '@fa9r'
- '@dnth'
- '@Cahllagerfeld'
- '@avishniakov'
- '@atzin-escandia'
Loading

0 comments on commit a871adc

Please sign in to comment.