Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #2467

Merged
merged 32 commits into from
Feb 26, 2024
Merged

Fix CI #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
90ebff2
update whylogs requirements
strickvl Feb 23, 2024
6bc5e21
try again
strickvl Feb 23, 2024
a15dda4
Merge branch 'develop' into bugfix/whylogs-extras
strickvl Feb 23, 2024
6902c9e
try 3rd time
strickvl Feb 23, 2024
a4d890a
4th
strickvl Feb 23, 2024
159ca0b
5th
strickvl Feb 23, 2024
34c91d4
remove cache
strickvl Feb 23, 2024
c839450
comment out cache
strickvl Feb 23, 2024
de84d0c
purge the cache
strickvl Feb 23, 2024
ef0d86f
don't use the cache dir
strickvl Feb 23, 2024
725a9e6
Auto-update of Starter template
actions-user Feb 23, 2024
04e08bd
relax 1.0.5
strickvl Feb 23, 2024
e3908b2
Merge branch 'bugfix/whylogs-extras' of github.com:zenml-io/zenml int…
strickvl Feb 23, 2024
130199d
only use modern whylogs
strickvl Feb 23, 2024
6c1d439
lower whylabs
strickvl Feb 23, 2024
960f520
go on, use the cache
strickvl Feb 23, 2024
20138b5
testing a hypothesis
strickvl Feb 23, 2024
423f649
Update ZenML integrations and installation script
strickvl Feb 24, 2024
5f6c657
test it
strickvl Feb 24, 2024
47a1807
trying higher constraints
strickvl Feb 24, 2024
3e21829
Revert "trying higher constraints"
strickvl Feb 24, 2024
635229d
Disable whylogs tests
strickvl Feb 26, 2024
8e71797
try dumping great_expectations
strickvl Feb 26, 2024
adb7dad
try with compiled integrations list
strickvl Feb 26, 2024
be7803f
compile happens in the CI now
strickvl Feb 26, 2024
e2cf1d2
try with whylogs and ge back in
strickvl Feb 26, 2024
d33568d
don't use blas and lapack
strickvl Feb 26, 2024
86d6859
add zenml to the integration installation
strickvl Feb 26, 2024
2d37139
add pyopenssl to requirements
strickvl Feb 26, 2024
eac23e6
uncomment whylogs + ge tests
strickvl Feb 26, 2024
466323a
straggler
strickvl Feb 26, 2024
ed7a164
Update .github/actions/setup_environment/action.yml
strickvl Feb 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions .github/actions/setup_environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ runs:
id: cache-virtualenv
with:
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)
# 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') }}
- uses: tespkg/actions-cache@v1
Expand Down Expand Up @@ -99,13 +99,13 @@ runs:
details: The custom github runnners cache was missed and failed to restore
the cache from minio bucket
webhookUrl: ${{ inputs.discord_webhook }}
# Disabled for now because it doesn't work well with multiple parallel jobs
# - uses: syphar/restore-pip-download-cache@v1
# with:
# Disabled for now because it doesn't work well with multiple parallel jobs
# - 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
# custom_cache_key_element: ${{ inputs.cache_version }}-${{ inputs.python-version }}-${{steps.date.outputs.week}}
# 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
Expand All @@ -117,16 +117,6 @@ runs:
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'
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'
shell: bash
run: |
scripts/install-zenml-dev.sh --integrations ${{ inputs.install_integrations }}
Expand Down
24 changes: 21 additions & 3 deletions scripts/install-zenml-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ parse_args () {

install_zenml() {
# install ZenML in editable mode
pip install -e .[server,templates,terraform,secrets-aws,secrets-gcp,secrets-azure,secrets-hashicorp,s3fs,gcsfs,adlfs,dev,mlstacks]

touch zenml_requirements.txt
echo "-e .[server,templates,terraform,secrets-aws,secrets-gcp,secrets-azure,secrets-hashicorp,s3fs,gcsfs,adlfs,dev,mlstacks]" >> zenml_requirements.txt

pip install -r zenml_requirements.txt
rm zenml_requirements.txt
}

install_integrations() {
Expand Down Expand Up @@ -52,9 +57,18 @@ install_integrations() {
# pin pyyaml>=6.0.1
echo "" >> integration-requirements.txt
echo "pyyaml>=6.0.1" >> integration-requirements.txt
echo "pyopenssl" >> integration-requirements.txt
echo "-e .[server,templates,terraform,secrets-aws,secrets-gcp,secrets-azure,secrets-hashicorp,s3fs,gcsfs,adlfs,dev,mlstacks]" >> integration-requirements.txt
cp integration-requirements.txt integration-requirements.in

pip install uv

pip install -r integration-requirements.txt
uv pip compile integration-requirements.in -o integration-requirements-compiled.txt

pip install -r integration-requirements-compiled.txt
rm integration-requirements.txt
rm integration-requirements.in
rm integration-requirements-compiled.txt

# install langchain separately
zenml integration install -y langchain
Expand All @@ -64,15 +78,19 @@ install_integrations() {
set -x
set -e

export ZENML_DEBUG=1
export ZENML_ANALYTICS_OPT_IN=false

parse_args "$@"

python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools wheel

install_zenml

# install integrations, if requested
if [ "$INTEGRATIONS" = yes ]; then
install_integrations

# refresh the ZenML installation after installing integrations
install_zenml
fi
5 changes: 4 additions & 1 deletion scripts/run-ci-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
set -e
set -x

export ZENML_DEBUG=1
export ZENML_ANALYTICS_OPT_IN=false

scripts/lint.sh
scripts/check-spelling.sh
scripts/docstring.sh
scripts/docstring.sh
Loading