Skip to content

Commit

Permalink
Merge pull request #36 from zenml-io/2024-04-05
Browse files Browse the repository at this point in the history
Fix `pyyaml-include` dependency issue
  • Loading branch information
strickvl authored Apr 5, 2024
2 parents 2512f56 + 71dbb60 commit c5882f9
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 60 deletions.
121 changes: 61 additions & 60 deletions .github/actions/e2e_template_test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,68 +23,69 @@ inputs:
runs:
using: "composite"
steps:
- name: Check out repository code
uses: actions/checkout@v3
with:
repository: zenml-io/template-e2e-batch
ref: ${{ inputs.ref-template }}
path: ./local_checkout
- name: Check out repository code
uses: actions/checkout@v3
with:
repository: zenml-io/template-e2e-batch
ref: ${{ inputs.ref-template }}
path: ./local_checkout

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python-version }}

- name: Configure git (non-Windows)
if: ${{ runner.os != 'Windows' }}
shell: bash
run: |
git config --global user.email "[email protected]"
git config --global user.name "ZenML GmbH"
- name: Configure git (Windows)
if: ${{ runner.os == 'Windows' }}
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: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python-version }}

- name: Install wheel
shell: bash
run: |
pip install wheel
- name: Install ZenML
if: ${{ inputs.ref-zenml != '' }}
shell: bash
run: |
pip install "zenml[dev, server, templates]@git+https://github.com/zenml-io/zenml.git@${{ inputs.ref-zenml }}"
- name: Install ZenML
if: ${{ inputs.ref-zenml == '' }}
shell: bash
run: |
pip install "zenml[dev, server, templates]"
- name: Concatenate requirements
shell: bash
run: |
zenml integration export-requirements -o ./local_checkout/integration-requirements.txt sklearn mlflow s3 slack evidently
cat ./local_checkout/test-requirements.txt ./local_checkout/integration-requirements.txt >> ./local_checkout/all-requirements.txt
- name: Configure git (non-Windows)
if: ${{ runner.os != 'Windows' }}
shell: bash
run: |
git config --global user.email "[email protected]"
git config --global user.name "ZenML GmbH"
- name: Install requirements
shell: bash
run: |
pip install -r ./local_checkout/all-requirements.txt
- name: Configure git (Windows)
if: ${{ runner.os == 'Windows' }}
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: Run pytests
shell: bash
env:
ZENML_STACK_NAME: ${{ inputs.stack-name }}
run: |
pytest ./local_checkout/tests
- name: Install wheel
shell: bash
run: |
pip install wheel uv
- name: Clean-up
shell: bash
run: |
rm -rf ./local_checkout
- name: Install ZenML
if: ${{ inputs.ref-zenml != '' }}
shell: bash
run: |
uv pip install --system "zenml[dev, server, templates]@git+https://github.com/zenml-io/zenml.git@${{ inputs.ref-zenml }}"
- name: Install ZenML
if: ${{ inputs.ref-zenml == '' }}
shell: bash
run: |
uv pip install --system "zenml[dev, server, templates]"
- name: Concatenate requirements
shell: bash
run: |
zenml integration export-requirements -o ./local_checkout/integration-requirements.txt sklearn mlflow s3 slack evidently
cat ./local_checkout/test-requirements.txt ./local_checkout/integration-requirements.txt >> ./local_checkout/all-requirements.txt
- name: Install requirements
shell: bash
run: |
uv pip install --system -r ./local_checkout/all-requirements.txt
uv pip install --system "pyyaml-include<2.0"
- name: Run pytests
shell: bash
env:
ZENML_STACK_NAME: ${{ inputs.stack-name }}
run: |
pytest ./local_checkout/tests
- name: Clean-up
shell: bash
run: |
rm -rf ./local_checkout
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
zenml[templates]
pyyaml-include<2.0

0 comments on commit c5882f9

Please sign in to comment.