From ac2ae95fc1d537db13a6711f003eb63ba47b25bb Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 30 Aug 2021 13:22:03 +0200 Subject: [PATCH 1/3] split CI package Signed-off-by: Jirka --- .github/workflows/pythonapp.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 482e1937e1..7c281ba613 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -202,6 +202,9 @@ jobs: packaging: runs-on: ubuntu-latest + env: + QUICKTEST: True + shell: bash steps: - uses: actions/checkout@v2 with: @@ -229,7 +232,7 @@ jobs: # however, "pip install monai*.tar.gz" will build cpp/cuda with an isolated # fresh torch installation according to pyproject.toml python -m pip install torch>=1.5 torchvision - - name: Test source archive and wheel file + - name: Check packages run: | pip uninstall monai pip list | grep -iv monai @@ -242,28 +245,32 @@ jobs: python setup.py check -m -s python setup.py sdist bdist_wheel python -m twine check dist/* - + - name: Move packages + run: | # move packages to a temp dir tmp_dir=$(mktemp -d) cp dist/monai* "$tmp_dir" rm -r build dist monai.egg-info cd "$tmp_dir" ls -al - + - name: Install wheel file + run: | # install from wheel python -m pip install monai*.whl python -c 'import monai; monai.config.print_config()' 2>&1 | grep -iv "unknown" python -c 'import monai; print(monai.__file__)' python -m pip uninstall -y monai rm monai*.whl - + - name: Install source archive + run: | # install from tar.gz name=$(ls *.tar.gz | head -n1) echo $name python -m pip install $name[all] python -c 'import monai; monai.config.print_config()' 2>&1 | grep -iv "unknown" python -c 'import monai; print(monai.__file__)' - + - name: Quick test + run: | # run min tests cp $root_dir/requirements*.txt "$tmp_dir" cp -r $root_dir/tests "$tmp_dir" @@ -271,9 +278,6 @@ jobs: ls -al python -m pip install -r requirements-dev.txt python -m unittest -v - env: - QUICKTEST: True - shell: bash build-docs: runs-on: ubuntu-latest From f2267795a5d36edbacb28cb3b2988d3650bbf02b Mon Sep 17 00:00:00 2001 From: Jirka Date: Fri, 3 Sep 2021 00:17:29 +0200 Subject: [PATCH 2/3] tmpdir Signed-off-by: Jirka --- .github/workflows/pythonapp.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 7c281ba613..94d9663d92 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -245,13 +245,15 @@ jobs: python setup.py check -m -s python setup.py sdist bdist_wheel python -m twine check dist/* + - name: Make Temp dir + run: echo "::set-output name=tmp_dir::$(mktemp -d)" + id: mktemp - name: Move packages run: | # move packages to a temp dir - tmp_dir=$(mktemp -d) - cp dist/monai* "$tmp_dir" + cp dist/monai* "${{ steps.mktemp.outputs.tmp_dir }}" rm -r build dist monai.egg-info - cd "$tmp_dir" + cd "${{ steps.mktemp.outputs.tmp_dir }}" ls -al - name: Install wheel file run: | @@ -272,8 +274,8 @@ jobs: - name: Quick test run: | # run min tests - cp $root_dir/requirements*.txt "$tmp_dir" - cp -r $root_dir/tests "$tmp_dir" + cp $root_dir/requirements*.txt "${{ steps.mktemp.outputs.tmp_dir }}" + cp -r $root_dir/tests "${{ steps.mktemp.outputs.tmp_dir }}" pwd ls -al python -m pip install -r requirements-dev.txt From dad8cc722c34cd5a53ad267d5e0b7310d2e42d75 Mon Sep 17 00:00:00 2001 From: Jirka Date: Fri, 3 Sep 2021 00:32:03 +0200 Subject: [PATCH 3/3] tmpdir Signed-off-by: Jirka --- .github/workflows/pythonapp.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 94d9663d92..3f18263e9e 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -237,25 +237,27 @@ jobs: pip uninstall monai pip list | grep -iv monai git fetch --depth=1 origin +refs/tags/*:refs/tags/* - root_dir=$PWD - echo "$root_dir" set -e # build tar.gz and wheel python setup.py check -m -s python setup.py sdist bdist_wheel python -m twine check dist/* - - name: Make Temp dir - run: echo "::set-output name=tmp_dir::$(mktemp -d)" + - run: echo "::set-output name=pwd::$PWD" + id: root + - run: echo "::set-output name=tmp_dir::$(mktemp -d)" id: mktemp - name: Move packages run: | + printf ${{ steps.root.outputs.pwd }} + printf ${{ steps.mktemp.outputs.tmp_dir }} # move packages to a temp dir cp dist/monai* "${{ steps.mktemp.outputs.tmp_dir }}" rm -r build dist monai.egg-info cd "${{ steps.mktemp.outputs.tmp_dir }}" ls -al - name: Install wheel file + working-directory: ${{ steps.mktemp.outputs.tmp_dir }} run: | # install from wheel python -m pip install monai*.whl @@ -264,6 +266,7 @@ jobs: python -m pip uninstall -y monai rm monai*.whl - name: Install source archive + working-directory: ${{ steps.mktemp.outputs.tmp_dir }} run: | # install from tar.gz name=$(ls *.tar.gz | head -n1) @@ -272,11 +275,11 @@ jobs: python -c 'import monai; monai.config.print_config()' 2>&1 | grep -iv "unknown" python -c 'import monai; print(monai.__file__)' - name: Quick test + working-directory: ${{ steps.mktemp.outputs.tmp_dir }} run: | # run min tests - cp $root_dir/requirements*.txt "${{ steps.mktemp.outputs.tmp_dir }}" - cp -r $root_dir/tests "${{ steps.mktemp.outputs.tmp_dir }}" - pwd + cp ${{ steps.root.outputs.pwd }}/requirements*.txt . + cp -r ${{ steps.root.outputs.pwd }}/tests . ls -al python -m pip install -r requirements-dev.txt python -m unittest -v