From 72ec146a36567070850b647f98eaa47f71559e02 Mon Sep 17 00:00:00 2001 From: Fridolin Pokorny Date: Mon, 18 Jan 2021 12:39:55 +0100 Subject: [PATCH 1/2] Move mlcube to root git directory --- mlcube/{mlcube => }/__init__.py | 0 mlcube/{mlcube => }/check.py | 0 mlcube/{mlcube => }/common/__init__.py | 0 mlcube/{mlcube => }/common/mlcube_metadata.py | 0 mlcube/{mlcube => }/common/objects/__init__.py | 0 mlcube/{mlcube => }/common/objects/base.py | 0 mlcube/{mlcube => }/common/objects/common.py | 0 mlcube/{mlcube => }/common/objects/platform_config.py | 0 mlcube/{mlcube => }/common/objects/runner_description.py | 0 mlcube/{mlcube => }/common/utils.py | 0 mlcube/{mlcube => }/generate_docker_template.py | 0 mlcube/{mlcube => }/main.py | 0 mlcube/{mlcube => }/parse.py | 0 mlcube/{mlcube => }/schemas/__init__.py | 0 mlcube/{mlcube => }/schemas/mlcube-docker.yaml | 0 mlcube/{mlcube => }/schemas/mlcube-invoke.yaml | 0 mlcube/{mlcube => }/schemas/mlcube-platform-container.yaml | 0 mlcube/{mlcube => }/schemas/mlcube-platform-metadata.yaml | 0 mlcube/{mlcube => }/schemas/mlcube-platform.yaml | 0 mlcube/{mlcube => }/schemas/mlcube-root.yaml | 0 mlcube/{mlcube => }/schemas/mlcube-runner.yaml | 0 mlcube/{mlcube => }/schemas/mlcube-task-input.yaml | 0 mlcube/{mlcube => }/schemas/mlcube-task-output.yaml | 0 mlcube/{mlcube => }/schemas/mlcube-task.yaml | 0 mlcube/{mlcube => }/tests/__init__.py | 0 mlcube/{mlcube => }/tests/test_mlcommons_box_cli.py | 0 mlcube/requirements.txt => requirements.txt | 0 mlcube/setup.py => setup.py | 0 28 files changed, 0 insertions(+), 0 deletions(-) rename mlcube/{mlcube => }/__init__.py (100%) rename mlcube/{mlcube => }/check.py (100%) rename mlcube/{mlcube => }/common/__init__.py (100%) rename mlcube/{mlcube => }/common/mlcube_metadata.py (100%) rename mlcube/{mlcube => }/common/objects/__init__.py (100%) rename mlcube/{mlcube => }/common/objects/base.py (100%) rename mlcube/{mlcube => }/common/objects/common.py (100%) rename mlcube/{mlcube => }/common/objects/platform_config.py (100%) rename mlcube/{mlcube => }/common/objects/runner_description.py (100%) rename mlcube/{mlcube => }/common/utils.py (100%) rename mlcube/{mlcube => }/generate_docker_template.py (100%) rename mlcube/{mlcube => }/main.py (100%) rename mlcube/{mlcube => }/parse.py (100%) rename mlcube/{mlcube => }/schemas/__init__.py (100%) rename mlcube/{mlcube => }/schemas/mlcube-docker.yaml (100%) rename mlcube/{mlcube => }/schemas/mlcube-invoke.yaml (100%) rename mlcube/{mlcube => }/schemas/mlcube-platform-container.yaml (100%) rename mlcube/{mlcube => }/schemas/mlcube-platform-metadata.yaml (100%) rename mlcube/{mlcube => }/schemas/mlcube-platform.yaml (100%) rename mlcube/{mlcube => }/schemas/mlcube-root.yaml (100%) rename mlcube/{mlcube => }/schemas/mlcube-runner.yaml (100%) rename mlcube/{mlcube => }/schemas/mlcube-task-input.yaml (100%) rename mlcube/{mlcube => }/schemas/mlcube-task-output.yaml (100%) rename mlcube/{mlcube => }/schemas/mlcube-task.yaml (100%) rename mlcube/{mlcube => }/tests/__init__.py (100%) rename mlcube/{mlcube => }/tests/test_mlcommons_box_cli.py (100%) rename mlcube/requirements.txt => requirements.txt (100%) rename mlcube/setup.py => setup.py (100%) diff --git a/mlcube/mlcube/__init__.py b/mlcube/__init__.py similarity index 100% rename from mlcube/mlcube/__init__.py rename to mlcube/__init__.py diff --git a/mlcube/mlcube/check.py b/mlcube/check.py similarity index 100% rename from mlcube/mlcube/check.py rename to mlcube/check.py diff --git a/mlcube/mlcube/common/__init__.py b/mlcube/common/__init__.py similarity index 100% rename from mlcube/mlcube/common/__init__.py rename to mlcube/common/__init__.py diff --git a/mlcube/mlcube/common/mlcube_metadata.py b/mlcube/common/mlcube_metadata.py similarity index 100% rename from mlcube/mlcube/common/mlcube_metadata.py rename to mlcube/common/mlcube_metadata.py diff --git a/mlcube/mlcube/common/objects/__init__.py b/mlcube/common/objects/__init__.py similarity index 100% rename from mlcube/mlcube/common/objects/__init__.py rename to mlcube/common/objects/__init__.py diff --git a/mlcube/mlcube/common/objects/base.py b/mlcube/common/objects/base.py similarity index 100% rename from mlcube/mlcube/common/objects/base.py rename to mlcube/common/objects/base.py diff --git a/mlcube/mlcube/common/objects/common.py b/mlcube/common/objects/common.py similarity index 100% rename from mlcube/mlcube/common/objects/common.py rename to mlcube/common/objects/common.py diff --git a/mlcube/mlcube/common/objects/platform_config.py b/mlcube/common/objects/platform_config.py similarity index 100% rename from mlcube/mlcube/common/objects/platform_config.py rename to mlcube/common/objects/platform_config.py diff --git a/mlcube/mlcube/common/objects/runner_description.py b/mlcube/common/objects/runner_description.py similarity index 100% rename from mlcube/mlcube/common/objects/runner_description.py rename to mlcube/common/objects/runner_description.py diff --git a/mlcube/mlcube/common/utils.py b/mlcube/common/utils.py similarity index 100% rename from mlcube/mlcube/common/utils.py rename to mlcube/common/utils.py diff --git a/mlcube/mlcube/generate_docker_template.py b/mlcube/generate_docker_template.py similarity index 100% rename from mlcube/mlcube/generate_docker_template.py rename to mlcube/generate_docker_template.py diff --git a/mlcube/mlcube/main.py b/mlcube/main.py similarity index 100% rename from mlcube/mlcube/main.py rename to mlcube/main.py diff --git a/mlcube/mlcube/parse.py b/mlcube/parse.py similarity index 100% rename from mlcube/mlcube/parse.py rename to mlcube/parse.py diff --git a/mlcube/mlcube/schemas/__init__.py b/mlcube/schemas/__init__.py similarity index 100% rename from mlcube/mlcube/schemas/__init__.py rename to mlcube/schemas/__init__.py diff --git a/mlcube/mlcube/schemas/mlcube-docker.yaml b/mlcube/schemas/mlcube-docker.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-docker.yaml rename to mlcube/schemas/mlcube-docker.yaml diff --git a/mlcube/mlcube/schemas/mlcube-invoke.yaml b/mlcube/schemas/mlcube-invoke.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-invoke.yaml rename to mlcube/schemas/mlcube-invoke.yaml diff --git a/mlcube/mlcube/schemas/mlcube-platform-container.yaml b/mlcube/schemas/mlcube-platform-container.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-platform-container.yaml rename to mlcube/schemas/mlcube-platform-container.yaml diff --git a/mlcube/mlcube/schemas/mlcube-platform-metadata.yaml b/mlcube/schemas/mlcube-platform-metadata.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-platform-metadata.yaml rename to mlcube/schemas/mlcube-platform-metadata.yaml diff --git a/mlcube/mlcube/schemas/mlcube-platform.yaml b/mlcube/schemas/mlcube-platform.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-platform.yaml rename to mlcube/schemas/mlcube-platform.yaml diff --git a/mlcube/mlcube/schemas/mlcube-root.yaml b/mlcube/schemas/mlcube-root.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-root.yaml rename to mlcube/schemas/mlcube-root.yaml diff --git a/mlcube/mlcube/schemas/mlcube-runner.yaml b/mlcube/schemas/mlcube-runner.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-runner.yaml rename to mlcube/schemas/mlcube-runner.yaml diff --git a/mlcube/mlcube/schemas/mlcube-task-input.yaml b/mlcube/schemas/mlcube-task-input.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-task-input.yaml rename to mlcube/schemas/mlcube-task-input.yaml diff --git a/mlcube/mlcube/schemas/mlcube-task-output.yaml b/mlcube/schemas/mlcube-task-output.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-task-output.yaml rename to mlcube/schemas/mlcube-task-output.yaml diff --git a/mlcube/mlcube/schemas/mlcube-task.yaml b/mlcube/schemas/mlcube-task.yaml similarity index 100% rename from mlcube/mlcube/schemas/mlcube-task.yaml rename to mlcube/schemas/mlcube-task.yaml diff --git a/mlcube/mlcube/tests/__init__.py b/mlcube/tests/__init__.py similarity index 100% rename from mlcube/mlcube/tests/__init__.py rename to mlcube/tests/__init__.py diff --git a/mlcube/mlcube/tests/test_mlcommons_box_cli.py b/mlcube/tests/test_mlcommons_box_cli.py similarity index 100% rename from mlcube/mlcube/tests/test_mlcommons_box_cli.py rename to mlcube/tests/test_mlcommons_box_cli.py diff --git a/mlcube/requirements.txt b/requirements.txt similarity index 100% rename from mlcube/requirements.txt rename to requirements.txt diff --git a/mlcube/setup.py b/setup.py similarity index 100% rename from mlcube/setup.py rename to setup.py From b11b0a23f5b3bec4fbf6811d05799508a322cb0c Mon Sep 17 00:00:00 2001 From: Fridolin Pokorny Date: Mon, 18 Jan 2021 12:47:08 +0100 Subject: [PATCH 2/2] Adjust workflows to reflect new directory structure --- .github/workflows/ci.yml | 4 +--- .github/workflows/python-publish.yml | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7851e0bf..f0b88fd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,13 +22,11 @@ jobs: python -m pip install --upgrade pip - name: Install MLCube run: | - cd mlcube pip install -r requirements.txt python setup.py sdist bdist_wheel pip install dist/mlcube*.whl - name: Test MLCube CLI run: | - cd mlcube pytest - name: Install MLCube Docker Runner run: | @@ -73,4 +71,4 @@ jobs: - name: Test MLCube GCP CLI run: | cd runners/mlcube_gcp - pytest \ No newline at end of file + pytest diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 9c2e40fe..fb6f0cb1 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -22,7 +22,6 @@ jobs: pip install setuptools wheel twine - name: Build distribution run: | - cd mlcube python setup.py sdist bdist_wheel - name: Publish uses: pypa/gh-action-pypi-publish@master @@ -31,7 +30,7 @@ jobs: verify_metadata: true skip_existing: true password: ${{ secrets.PYPI_PASSWORD }} - packages_dir: mlcube/dist/ + packages_dir: dist/ repository_url: https://upload.pypi.org/legacy/ verbose: true env: