Rename batch-ensembler module and mentions with pyfunc-ensembler-job

caraml-dev · Feb 15, 2022 · d5b9a40 · d5b9a40
1 parent 0d7fe79
commit d5b9a40
Show file tree

Hide file tree

Showing 32 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/batch-ensembler.yaml b/.github/workflows/batch-ensembler.yaml
@@ -1,25 +1,25 @@
-name: engines/batch-ensembler
+name: engines/pyfunc-ensembler-job
 
 on:
   # Automatically run CI on Release and Pre-Release tags and main branch
   # (only if there are changes to relevant paths)
   push:
     tags:
-      - "batch-ensembler/v[0-9]+.[0-9]+.[0-9]+*"
+      - "pyfunc-ensembler-job/v[0-9]+.[0-9]+.[0-9]+*"
     branches:
       - main
     paths:
-      - ".github/workflows/batch-ensembler.yaml"
-      - "engines/batch-ensembler/**"
+      - ".github/workflows/pyfunc-ensembler-job.yaml"
+      - "engines/pyfunc-ensembler-job/**"
       - "sdk/**"
 
   # Automatically run CI on branches, that have active PR opened
   pull_request:
     branches:
       - main
     paths:
-      - ".github/workflows/batch-ensembler.yaml"
-      - "engines/batch-ensembler/**"
+      - ".github/workflows/pyfunc-ensembler-job.yaml"
+      - "engines/pyfunc-ensembler-job/**"
       - "sdk/**"
 
   # To make it possible to trigger e2e CI workflow for any arbitrary git ref
@@ -50,13 +50,13 @@ jobs:
       - name: Cache Conda environment
         uses: actions/cache@v2
         with:
-          path: engines/batch-ensembler/env
+          path: engines/pyfunc-ensembler-job/env
           key: |
-            conda-${{ hashFiles('engines/batch-ensembler/environment.yaml') }}-${{ hashFiles('engines/batch-ensembler/requirements.txt') }}-${{ hashFiles('engines/batch-ensembler/requirements.dev.txt') }}
+            conda-${{ hashFiles('engines/pyfunc-ensembler-job/environment.yaml') }}-${{ hashFiles('engines/pyfunc-ensembler-job/requirements.txt') }}-${{ hashFiles('engines/pyfunc-ensembler-job/requirements.dev.txt') }}
           restore-keys: conda-
 
       - name: Run Tests
-        working-directory: engines/batch-ensembler
+        working-directory: engines/pyfunc-ensembler-job
         run: |
           make setup
           make test
@@ -70,7 +70,7 @@ jobs:
       - id: release-rules
         uses: ./.github/actions/release-rules
         with:
-          prefix: batch-ensembler/
+          prefix: pyfunc-ensembler-job/
 
   publish:
     # Automatically publish release and pre-release artifacts.
@@ -103,13 +103,13 @@ jobs:
 
       - name: Build Docker Image
         id: build
-        working-directory: engines/batch-ensembler
+        working-directory: engines/pyfunc-ensembler-job
         env:
           DOCKER_REGISTRY: ghcr.io/${{ github.repository }}
         run: |
           set -o pipefail
           make build-image | tee output.log
-          echo "::set-output name=ensembler-image::$(sed -n 's%Building docker image: \(.*\)%\1%p' output.log)"
+          echo "::set-output name=pyfunc-ensembler-job::$(sed -n 's%Building docker image: \(.*\)%\1%p' output.log)"
 
-      - name: Publish Batch Ensembler Docker Image
-        run: docker push ${{ steps.build.outputs.ensembler-image }}
+      - name: Publish Pyfunc Ensembler Job Docker Image
+        run: docker push ${{ steps.build.outputs.pyfunc-ensembler-job }}
diff --git a/.github/workflows/turing.yaml b/.github/workflows/turing.yaml
@@ -10,9 +10,9 @@ on:
       - main
     paths-ignore:
       - "docs/**"
-      - "engines/batch-ensembler/**"
+      - "engines/pyfunc-ensembler-job/**"
       - "sdk/**"
-      - ".github/workflows/batch-ensembler.yaml"
+      - ".github/workflows/pyfunc-ensembler-job.yaml"
       - ".github/workflows/sdk.yaml"
       - ".github/workflows/helm-chart.yaml"
       - ".github/workflows/cluster-init.yaml"
@@ -23,9 +23,9 @@ on:
       - main
     paths-ignore:
       - "docs/**"
-      - "engines/batch-ensembler/**"
+      - "engines/pyfunc-ensembler-job/**"
       - "sdk/**"
-      - ".github/workflows/batch-ensembler.yaml"
+      - ".github/workflows/pyfunc-ensembler-job.yaml"
       - ".github/workflows/sdk.yaml"
       - ".github/workflows/helm-chart.yaml"
 

diff --git a/README.md b/README.md
@@ -180,10 +180,10 @@ BatchEnsemblingConfig:
     BuildNamespace: default
     BuildTimeoutDuration: 20m
     DestinationRegistry: ghcr.io
-    BaseImageRef: ghcr.io/gojek/turing/batch-ensembler:latest
+    BaseImageRef: ghcr.io/gojek/turing/pyfunc-ensembler-job:latest
     KanikoConfig:
       BuildContextURI: git://github.com/gojek/turing.git#refs/heads/main
-      DockerfileFilePath: engines/batch-ensembler/app.Dockerfile
+      DockerfileFilePath: engines/pyfunc-ensembler-job/app.Dockerfile
       Image: gcr.io/kaniko-project/executor
       ImageVersion: v1.6.0
       ResourceRequestsLimits:

diff --git a/api/config-dev.yaml b/api/config-dev.yaml
@@ -19,10 +19,10 @@ BatchEnsemblingConfig:
     BuildNamespace: default
     BuildTimeoutDuration: 20m
     DestinationRegistry: ghcr.io
-    BaseImageRef: ghcr.io/gojek/turing/batch-ensembler:latest
+    BaseImageRef: ghcr.io/gojek/turing/pyfunc-ensembler-job:latest
     KanikoConfig:
       BuildContextURI: git://github.com/gojek/turing.git#refs/heads/main
-      DockerfileFilePath: engines/batch-ensembler/app.Dockerfile
+      DockerfileFilePath: engines/pyfunc-ensembler-job/app.Dockerfile
       Image: gcr.io/kaniko-project/executor
       ImageVersion: v1.6.0
       ResourceRequestsLimits:

diff --git a/api/turing/config/example.yaml b/api/turing/config/example.yaml
@@ -42,10 +42,10 @@ BatchEnsemblingConfig:
     BuildNamespace: default
     BuildTimeoutDuration: 20m
     DestinationRegistry: ghcr.io
-    BaseImageRef: ghcr.io/gojek/turing/batch-ensembler:latest
+    BaseImageRef: ghcr.io/gojek/turing/pyfunc-ensembler-job:latest
     KanikoConfig:
       BuildContextURI: git://github.com/gojek/turing.git#refs/heads/main
-      DockerfileFilePath: engines/batch-ensembler/app.Dockerfile
+      DockerfileFilePath: engines/pyfunc-ensembler-job/app.Dockerfile
       Image: gcr.io/kaniko-project/executor
       ImageVersion: v1.6.0
       ResourceRequestsLimits:

diff --git a/engines/batch-ensembler/.dockerignore → engines/pyfunc-ensembler-job/.dockerignore b/engines/batch-ensembler/.dockerignore → engines/pyfunc-ensembler-job/.dockerignore
diff --git a/engines/batch-ensembler/.gitignore → engines/pyfunc-ensembler-job/.gitignore b/engines/batch-ensembler/.gitignore → engines/pyfunc-ensembler-job/.gitignore
diff --git a/engines/batch-ensembler/Dockerfile → engines/pyfunc-ensembler-job/Dockerfile b/engines/batch-ensembler/Dockerfile → engines/pyfunc-ensembler-job/Dockerfile
diff --git a/engines/batch-ensembler/Makefile → engines/pyfunc-ensembler-job/Makefile b/engines/batch-ensembler/Makefile → engines/pyfunc-ensembler-job/Makefile
diff --git a/engines/batch-ensembler/README.md → engines/pyfunc-ensembler-job/README.md b/engines/batch-ensembler/README.md → engines/pyfunc-ensembler-job/README.md
diff --git a/engines/batch-ensembler/app.Dockerfile → engines/pyfunc-ensembler-job/app.Dockerfile b/engines/batch-ensembler/app.Dockerfile → engines/pyfunc-ensembler-job/app.Dockerfile
diff --git a/...nes/batch-ensembler/ensembler/__init__.py → ...yfunc-ensembler-job/ensembler/__init__.py b/...nes/batch-ensembler/ensembler/__init__.py → ...yfunc-ensembler-job/ensembler/__init__.py
diff --git a/engines/batch-ensembler/ensembler/dataset.py → ...pyfunc-ensembler-job/ensembler/dataset.py b/engines/batch-ensembler/ensembler/dataset.py → ...pyfunc-ensembler-job/ensembler/dataset.py
diff --git a/...es/batch-ensembler/ensembler/ensembler.py → ...func-ensembler-job/ensembler/ensembler.py b/...es/batch-ensembler/ensembler/ensembler.py → ...func-ensembler-job/ensembler/ensembler.py
diff --git a/engines/batch-ensembler/ensembler/job.py → ...nes/pyfunc-ensembler-job/ensembler/job.py b/engines/batch-ensembler/ensembler/job.py → ...nes/pyfunc-ensembler-job/ensembler/job.py
diff --git a/engines/batch-ensembler/ensembler/sink.py → ...es/pyfunc-ensembler-job/ensembler/sink.py b/engines/batch-ensembler/ensembler/sink.py → ...es/pyfunc-ensembler-job/ensembler/sink.py
diff --git a/engines/batch-ensembler/ensembler/source.py → .../pyfunc-ensembler-job/ensembler/source.py b/engines/batch-ensembler/ensembler/source.py → .../pyfunc-ensembler-job/ensembler/source.py
diff --git a/...nsembler/ensembler/sql/bq_join.sql.jinja2 → ...bler-job/ensembler/sql/bq_join.sql.jinja2 b/...nsembler/ensembler/sql/bq_join.sql.jinja2 → ...bler-job/ensembler/sql/bq_join.sql.jinja2
diff --git a/...embler/ensembler/sql/bq_select.sql.jinja2 → ...er-job/ensembler/sql/bq_select.sql.jinja2 b/...embler/ensembler/sql/bq_select.sql.jinja2 → ...er-job/ensembler/sql/bq_select.sql.jinja2
diff --git a/engines/batch-ensembler/entrypoint.sh → engines/pyfunc-ensembler-job/entrypoint.sh b/engines/batch-ensembler/entrypoint.sh → engines/pyfunc-ensembler-job/entrypoint.sh
diff --git a/engines/batch-ensembler/environment.yaml → ...nes/pyfunc-ensembler-job/environment.yaml b/engines/batch-ensembler/environment.yaml → ...nes/pyfunc-ensembler-job/environment.yaml
@@ -1,4 +1,4 @@
-name: batch-ensembler
+name: pyfunc-ensembler-job
 dependencies:
   - python=3.8
   - pip=21.0.1

diff --git a/engines/batch-ensembler/main.py → engines/pyfunc-ensembler-job/main.py b/engines/batch-ensembler/main.py → engines/pyfunc-ensembler-job/main.py
diff --git a/engines/batch-ensembler/requirements.dev.txt → ...pyfunc-ensembler-job/requirements.dev.txt b/engines/batch-ensembler/requirements.dev.txt → ...pyfunc-ensembler-job/requirements.dev.txt
diff --git a/engines/batch-ensembler/requirements.txt → ...nes/pyfunc-ensembler-job/requirements.txt b/engines/batch-ensembler/requirements.txt → ...nes/pyfunc-ensembler-job/requirements.txt
diff --git a/engines/batch-ensembler/setup.py → engines/pyfunc-ensembler-job/setup.py b/engines/batch-ensembler/setup.py → engines/pyfunc-ensembler-job/setup.py
@@ -18,7 +18,7 @@
     ]
 
 setuptools.setup(
-    name='batch-ensembler',
+    name='pyfunc-ensembler-job',
     packages=setuptools.find_packages(),
     install_requires=requirements,
     dev_requirements=dev_requirements,

diff --git a/engines/batch-ensembler/tests/__init__.py → ...es/pyfunc-ensembler-job/tests/__init__.py b/engines/batch-ensembler/tests/__init__.py → ...es/pyfunc-ensembler-job/tests/__init__.py
diff --git a/engines/batch-ensembler/tests/conftest.py → ...es/pyfunc-ensembler-job/tests/conftest.py b/engines/batch-ensembler/tests/conftest.py → ...es/pyfunc-ensembler-job/tests/conftest.py
diff --git a/...nes/batch-ensembler/tests/dataset_test.py → ...yfunc-ensembler-job/tests/dataset_test.py b/...nes/batch-ensembler/tests/dataset_test.py → ...yfunc-ensembler-job/tests/dataset_test.py
diff --git a/...s/batch-ensembler/tests/ensembler_test.py → ...unc-ensembler-job/tests/ensembler_test.py b/...s/batch-ensembler/tests/ensembler_test.py → ...unc-ensembler-job/tests/ensembler_test.py
diff --git a/engines/batch-ensembler/tests/sink_test.py → ...s/pyfunc-ensembler-job/tests/sink_test.py b/engines/batch-ensembler/tests/sink_test.py → ...s/pyfunc-ensembler-job/tests/sink_test.py
diff --git a/...s/batch-ensembler/tests/utils/__init__.py → ...unc-ensembler-job/tests/utils/__init__.py b/...s/batch-ensembler/tests/utils/__init__.py → ...unc-ensembler-job/tests/utils/__init__.py
diff --git a/...ch-ensembler/tests/utils/openapi_utils.py → ...nsembler-job/tests/utils/openapi_utils.py b/...ch-ensembler/tests/utils/openapi_utils.py → ...nsembler-job/tests/utils/openapi_utils.py