Rename gordo-components -> gordo (#831)

.dockerignore

@@ -1,6 +1,6 @@
 /venv
 /.eggs
-/gordo_components.egg-info
+/*.egg-info
 /htmlcov
 /.coverage
 /dist

.gitignore

@@ -104,4 +104,4 @@ venv.bak/
 
 .vscode/
 *.pkl
-/gordo_components/_version.py
+/gordo/_version.py

.travis.yml

@@ -15,7 +15,7 @@ os:
 env:
   global:
     - DOCKER_REGISTRY=auroradevacr.azurecr.io
-    - DOCKER_REPO=gordo-components
+    - DOCKER_REPO=gordo
 
 install: skip
 

Dockerfile-Client

@@ -8,7 +8,7 @@ COPY .git /code/
 WORKDIR /code
 RUN rm -rf /code/dist \
     && python setup.py sdist \
-    && mv /code/dist/$(ls /code/dist | head -1) /code/dist/gordo-components-packed.tar.gz
+    && mv /code/dist/$(ls /code/dist | head -1) /code/dist/gordo-packed.tar.gz
 
 # Extract a few big dependencies which docker will cache even when other dependencies change
 RUN cat /code/requirements.txt | grep tensorflow== > /code/prereq.txt \
@@ -32,9 +32,9 @@ RUN pip install --no-deps -r prereq.txt --no-cache-dir
 COPY requirements.txt .
 RUN pip install -r requirements.txt --no-cache-dir
 
-# Install gordo-components, packaged from earlier 'python setup.py sdist'
-COPY --from=builder /code/dist/gordo-components-packed.tar.gz .
-RUN pip install gordo-components-packed.tar.gz
+# Install gordo, packaged from earlier 'python setup.py sdist'
+COPY --from=builder /code/dist/gordo-packed.tar.gz .
+RUN pip install gordo-packed.tar.gz
 
 # Make gordo own all in its home
 RUN chown -R gordo:gordo ${HOME}
@@ -45,4 +45,4 @@ USER gordo
 # Run things from gordo's home to have write access when needed (e.g. Catboost tmp files)
 WORKDIR ${HOME}
 
-CMD ["gordo-components", "client"]
+CMD ["gordo", "client"]

Dockerfile-GordoDeploy

@@ -12,7 +12,7 @@ COPY .git /code/
 WORKDIR /code
 RUN rm -rf /code/dist \
     && python setup.py sdist \
-    && mv /code/dist/$(ls /code/dist | head -1) /code/dist/gordo-components-packed.tar.gz
+    && mv /code/dist/$(ls /code/dist | head -1) /code/dist/gordo-packed.tar.gz
 
 
 # Extract a few big dependencies which docker will cache even when other dependencies change
@@ -42,16 +42,16 @@ RUN groupadd -g 999 gordo && \
 ENV HOME "/home/gordo"
 ENV PATH "${HOME}/.local/bin:${PATH}"
 
-# Install requirements and gordo-components packaged in intermediate image 'python setup.py sdist'
+# Install requirements and gordo packaged in intermediate image 'python setup.py sdist'
 COPY --from=builder /code/prereq.txt .
 RUN pip install --no-deps -r prereq.txt --no-cache-dir
 
 COPY requirements.txt .
 RUN pip install -r requirements.txt --no-cache-dir
 
-# Install gordo-components, packaged from earlier 'python setup.py sdist'
-COPY --from=builder /code/dist/gordo-components-packed.tar.gz .
-RUN pip install gordo-components-packed.tar.gz
+# Install gordo, packaged from earlier 'python setup.py sdist'
+COPY --from=builder /code/dist/gordo-packed.tar.gz .
+RUN pip install gordo-packed.tar.gz
 
 RUN apt-get update && apt-get install -y \
     curl \

Dockerfile-ModelBuilder

@@ -8,7 +8,7 @@ COPY .git /code/
 WORKDIR /code
 RUN rm -rf /code/dist \
     && python setup.py sdist \
-    && mv /code/dist/$(ls /code/dist | head -1) /code/dist/gordo-components-packed.tar.gz
+    && mv /code/dist/$(ls /code/dist | head -1) /code/dist/gordo-packed.tar.gz
 
 # Extract a few big dependencies which docker will cache even when other dependencies change
 RUN cat /code/requirements.txt | grep tensorflow== > /code/prereq.txt \
@@ -33,9 +33,9 @@ RUN pip install --no-deps -r prereq.txt --no-cache-dir
 COPY requirements.txt .
 RUN pip install -r requirements.txt --no-cache-dir
 
-# Install gordo-components, packaged from earlier 'python setup.py sdist'
-COPY --from=builder /code/dist/gordo-components-packed.tar.gz .
-RUN pip install gordo-components-packed.tar.gz
+# Install gordo, packaged from earlier 'python setup.py sdist'
+COPY --from=builder /code/dist/gordo-packed.tar.gz .
+RUN pip install gordo-packed.tar.gz
 
 ADD build.sh ${HOME}/build.sh
 

Dockerfile-ModelServer

@@ -8,7 +8,7 @@ COPY .git /code/
 WORKDIR /code
 RUN rm -rf /code/dist \
     && python setup.py sdist \
-    && mv /code/dist/$(ls /code/dist | head -1) /code/dist/gordo-components-packed.tar.gz
+    && mv /code/dist/$(ls /code/dist | head -1) /code/dist/gordo-packed.tar.gz
 
 # Extract a few big dependencies which docker will cache even when other dependencies change
 RUN cat /code/requirements.txt | grep tensorflow== > /code/prereq.txt \
@@ -33,9 +33,9 @@ RUN pip install --no-deps -r prereq.txt --no-cache-dir
 COPY requirements.txt .
 RUN pip install -r requirements.txt --no-cache-dir
 
-# Install gordo-components, packaged from earlier 'python setup.py sdist'
-COPY --from=builder /code/dist/gordo-components-packed.tar.gz .
-RUN pip install gordo-components-packed.tar.gz
+# Install gordo, packaged from earlier 'python setup.py sdist'
+COPY --from=builder /code/dist/gordo-packed.tar.gz .
+RUN pip install gordo-packed.tar.gz
 
 # Make gordo own all in its home
 RUN chown -R gordo:gordo ${HOME}
@@ -46,4 +46,4 @@ USER gordo
 # Run things from gordo's home to have write access when needed (e.g. Catboost tmp files)
 WORKDIR ${HOME}
 
-CMD ["gordo-components", "run-server"]
+CMD ["gordo", "run-server"]

Makefile

@@ -45,7 +45,7 @@ push-dev-images:
 
 	# Push everything to auroradevacr.azurecr.io/gordo-components
 	export DOCKER_REGISTRY=auroradevacr.azurecr.io;\
-	export DOCKER_REPO=gordo-components;\
+	export DOCKER_REPO=gordo;\
 	$(MAKE) push-builder push-server push-client push-workflow-generator
 
 	# Also push workflow-generator to auroradevacr.azurecr.io/gordo-infrastructure

README.md

@@ -1,6 +1,6 @@
 
 
-<h1 align="center">Gordo Components</h1>
+<h1 align="center">Gordo</h1>
 <div align="center">
  <!-- Uncomment line below once we decided on 'logo.png' -->
  <!--<img align="center" src="logo.png" width="250" height="250">-->
@@ -13,33 +13,30 @@
 <br />
 
 <div align="center">
-  <a href="https://github.com/equinor/gordo-components/actions?query=branch=master">
-    <img src="https://github.com/equinor/gordo-components/workflows/CI/badge.svg?branch=master" alt="Build Status"/>
+  <a href="https://github.com/equinor/gordo/actions?query=branch=master">
+    <img src="https://github.com/equinor/gordo/workflows/CI/badge.svg?branch=master" alt="Build Status"/>
   </a>
-  <a href="https://codecov.io/gh/equinor/gordo-components">
-    <img src="https://codecov.io/gh/equinor/gordo-components/branch/master/graph/badge.svg" alt="Codecov"/>
+  <a href="https://codecov.io/gh/equinor/gordo">
+    <img src="https://codecov.io/gh/equinor/gordo/branch/master/graph/badge.svg" alt="Codecov"/>
   </a>
-  <a href="https://gordo-components.readthedocs.io/en/latest/?badge=latest">
-    <img src="https://readthedocs.org/projects/gordo-components/badge/?version=latest" alt="Documentation"/>
+  <a href="https://gordo.readthedocs.io/en/latest/?badge=latest">
+    <img src="https://readthedocs.org/projects/gordo/badge/?version=latest" alt="Documentation"/>
   </a> 
   <a href="https://dependabot.com">
-    <img src="https://api.dependabot.com/badges/status?host=github&repo=equinor/gordo-components" alt="Dependabot"/>
+    <img src="https://api.dependabot.com/badges/status?host=github&repo=equinor/gordo" alt="Dependabot"/>
   </a>
 </div>
 
 ---
 
 ## About:
-Gordo-Components is part of the common ML ops provided by `gordo`
 
-It fulfills the role of inhaling config files and supplying components to the pipeline of:
+Gordo fulfills the role of inhaling config files and supplying components to the pipeline of:
 
 1. Fetching data
 2. Training model
 3. Serving model
 
-It is designed to be used _by_ `gordo` and not (at present) as a standalone tool.
-
 ---
 
 ## Examples
@@ -49,10 +46,10 @@ See our [example](./examples) notebooks for how to develop with `gordo` locally.
 ---
 
 ## Install: 
-`pip install --upgrade gordo-components`  
+`pip install --upgrade gordo`  
 
 Bleeding edge:  
-`pip install git+https://github.com/equinor/gordo-components.git`
+`pip install git+https://github.com/equinor/gordo.git`
 
 ## Uninstall:
-`pip uninstall gordo-components`
+`pip uninstall gordo`

benchmarks/load_test/load_test.py

@@ -9,7 +9,7 @@
 import click
 from locust import HttpLocust
 
-from gordo_components.client.utils import EndpointMetadata
+from gordo.client.utils import EndpointMetadata
 
 TEMPLATE_FILE = "task_set.py.jinja2"
 Task = namedtuple("Task", "name path json")

build.sh

@@ -10,6 +10,6 @@ done
 
 ls -l /gordo
 
-gordo-components build 
+gordo build
 
 ls -l /gordo

docker_push.sh

@@ -60,7 +60,7 @@ fi
 
 # Ensure we're getting the latest version, including any dirty state of the repo
 # replacing any '+' development identifier with an underscore for docker compatibility
-export version=$(docker run --rm $DOCKER_IMAGE gordo-components --version | tr + _)
+export version=$(docker run --rm $DOCKER_IMAGE gordo --version | tr + _)
 
 
 if [[ -z "${GORDO_PROD_MODE}" ]]; then

docs/components/builder.rst

@@ -3,7 +3,7 @@ Builder
 
 Model builder
 =============
-.. automodule:: gordo_components.builder.build_model
+.. automodule:: gordo.builder.build_model
     :members:
     :undoc-members:
     :show-inheritance:
@@ -15,7 +15,7 @@ Local Model builder
 This is meant to provide a good way to validate a configuration file
 as well as to enable creating and testing models locally with little overhead.
 
-.. automodule:: gordo_components.builder.local_build
+.. automodule:: gordo.builder.local_build
     :members:
     :undoc-members:
     :show-inheritance:

docs/components/cli.rst

@@ -1,11 +1,11 @@
 CLI
 ---
 
-gordo-components CLI
+gordo CLI
 ====================
 
 Available CLIs for Gordo:
 
-.. click:: gordo_components.cli:gordo
-    :prog: gordo-components
+.. click:: gordo.cli:gordo
+    :prog: gordo
     :show-nested:

docs/components/client.rst

@@ -11,7 +11,7 @@ Client
 
 Client for interacting with the ML Server
 
-.. automodule:: gordo_components.client.client
+.. automodule:: gordo.client.client
     :members:
     :undoc-members:
     :show-inheritance:
@@ -23,7 +23,7 @@ Forwarders
 Objects to be optionally provided to the Client which forwards the resulting
 predictions.
 
-.. automodule:: gordo_components.client.forwarders
+.. automodule:: gordo.client.forwarders
     :members:
     :undoc-members:
     :show-inheritance:
@@ -33,7 +33,7 @@ IO
 
 IO helpers used internally by the Client
 
-.. automodule:: gordo_components.client.io
+.. automodule:: gordo.client.io
     :members:
     :undoc-members:
     :show-inheritance:
@@ -44,7 +44,7 @@ Utils
 
 General utility functions for the Client
 
-.. automodule:: gordo_components.client.utils
+.. automodule:: gordo.client.utils
     :members:
     :undoc-members:
     :show-inheritance:

docs/components/machine/data_provider.rst

@@ -3,35 +3,35 @@ Data Providers & Readers
 
 Data Providers
 ==============
-.. automodule:: gordo_components.machine.dataset.data_provider.providers
+.. automodule:: gordo.machine.dataset.data_provider.providers
     :members:
     :undoc-members:
     :show-inheritance:
 
 IROC Reader
 ===========
-.. automodule:: gordo_components.machine.dataset.data_provider.iroc_reader
+.. automodule:: gordo.machine.dataset.data_provider.iroc_reader
     :members:
     :undoc-members:
     :show-inheritance:
 
 NCS Reader
 ==========
-.. automodule:: gordo_components.machine.dataset.data_provider.ncs_reader
+.. automodule:: gordo.machine.dataset.data_provider.ncs_reader
     :members:
     :undoc-members:
     :show-inheritance:
 
 Azure Utils
 ===========
-.. automodule:: gordo_components.machine.dataset.data_provider.azure_utils
+.. automodule:: gordo.machine.dataset.data_provider.azure_utils
     :members:
     :undoc-members:
     :show-inheritance:
 
 Base Data Provider
 ==================
-.. automodule:: gordo_components.machine.dataset.data_provider.base
+.. automodule:: gordo.machine.dataset.data_provider.base
     :members:
     :undoc-members:
     :show-inheritance:

docs/components/machine/dataset.rst

@@ -3,14 +3,14 @@ Datasets
 
 Datasets
 ========
-.. automodule:: gordo_components.machine.dataset.datasets
+.. automodule:: gordo.machine.dataset.datasets
     :members:
     :undoc-members:
     :show-inheritance:
 
 Base Dataset
 ============
-.. automodule:: gordo_components.machine.dataset.base
+.. automodule:: gordo.machine.dataset.base
     :members:
     :undoc-members:
     :show-inheritance:

docs/components/machine/machine.rst

@@ -6,7 +6,7 @@ a model, dataset, metadata and everything
 needed to create and build a ML model to
 be served by a deployment.
 
-.. automodule:: gordo_components.machine.machine.Machine
+.. automodule:: gordo.machine.machine.Machine
     :members:
     :undoc-members:
     :show-inheritance:

docs/components/machine/model/anomaly.rst

@@ -10,7 +10,7 @@ AnomalyDetectorBase
 
 The base class for all other anomaly detector models
 
-.. automodule:: gordo_components.machine.model.anomaly.base
+.. automodule:: gordo.machine.model.anomaly.base
     :members:
     :undoc-members:
     :show-inheritance:
@@ -22,7 +22,7 @@ DiffBasedAnomalyDetector
 Calculates the absolute value prediction differences between y and yhat as well
 as the absolute difference error between both matrices via ``numpy.linalg.norm(..., axis=1)``
 
-.. automodule:: gordo_components.machine.model.anomaly.diff
+.. automodule:: gordo.machine.model.anomaly.diff
     :members:
     :undoc-members:
     :show-inheritance: