Prepare for next development iteration

budavarapu · Mar 10, 2021 · d711a00 · d711a00
1 parent 54ddbc6
commit d711a00
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 43 deletions.
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ SHELL:=/bin/bash
 
 AIRFLOW_NOTEBOOK_VERSION:=0.0.4
 
-TAG:=2.1.0rc3
+TAG:=dev
 IMAGE=elyra/elyra:$(TAG)
 ELYRA_AIRFLOW_IMAGE=elyra/airflow:$(TAG)
 

diff --git a/README.md b/README.md
@@ -65,14 +65,14 @@ You can also try Elyra by running one of the docker images from [Docker Hub](htt
 The command below starts the most recent development build in a clean environment:
 
 ```
-docker run -it -p 8888:8888 elyra/elyra:2.1.0rc3 jupyter lab --debug
+docker run -it -p 8888:8888 elyra/elyra:dev jupyter lab --debug
 ```
 
 To make a local directory containing your Notebooks (e.g. ${HOME}/opensource/jupyter-notebooks/) available in your
 docker container, you can use a mount command similar to the following:
 
 ```
-docker run -it -p 8888:8888 -v ${HOME}/opensource/jupyter-notebooks/:/home/jovyan/work -w /home/jovyan/work elyra/elyra:2.1.0rc3 jupyter lab --debug
+docker run -it -p 8888:8888 -v ${HOME}/opensource/jupyter-notebooks/:/home/jovyan/work -w /home/jovyan/work elyra/elyra:dev jupyter lab --debug
 ```
 
 These should produce output similar to that below, where you can then find the URL to be used

diff --git a/docs/source/getting_started/installation.md b/docs/source/getting_started/installation.md
@@ -207,7 +207,7 @@ docker pull quay.io/elyra/elyra:dev
 Invocation example 1: Run the most recent Elyra development build in a Docker container. All changes are discarded when the Docker container is stopped.
 
 ```
-docker run -it -p 8888:8888 elyra/elyra:2.1.0rc3 jupyter lab --debug
+docker run -it -p 8888:8888 elyra/elyra:dev jupyter lab --debug
 ```
 
 Invocation example 2: Run the most recent Elyra development build in a Docker container and mount the existing local `$HOME/jupyter-notebooks/` directory as JupyterLab work directory. This enables you to make existing notebooks and other files available in the Docker container. Only files in this working directory are retained when the Docker container is stopped. 
@@ -216,7 +216,7 @@ Invocation example 2: Run the most recent Elyra development build in a Docker co
 docker run -it -p 8888:8888\
  -v ${HOME}/jupyter-notebooks/:/home/jovyan/work\
  -w /home/jovyan/work\
- elyra/elyra:2.1.0rc3 jupyter lab --debug
+ elyra/elyra:dev jupyter lab --debug
 ```
 
 Invocation example 3: Same as above. In addition a local directory named `${HOME}/jupyter-data-dir` is mounted as the Jupyter data directory in the Docker container, storing all user-defined Elyra metadata artifacts you might create, such as code snippets, runtime configurations, or runtime images.
@@ -228,7 +228,7 @@ docker run -it -p 8888:8888\
  -v ${HOME}/jupyter-notebooks/:/home/jovyan/work\
  -w /home/jovyan/work\
  -v ${HOME}/jupyter-data-dir:/home/jovyan/.local/share/jupyter\
- elyra/elyra:2.1.0rc3 jupyter lab --debug
+ elyra/elyra:dev jupyter lab --debug
 ```
 
 Open the displayed URL in your browser to start using JupyterLab and Elyra.

diff --git a/docs/source/recipes/configure-airflow-as-a-runtime.md b/docs/source/recipes/configure-airflow-as-a-runtime.md
@@ -37,7 +37,7 @@ AND
 - A Kubernetes Cluster without Apache Airflow installed
     - Ensure Kubernetes is at least v1.18. Earlier versions might work  but have not been tested.
     - Helm v3.0 or later
-    - Use the [Helm chart](https://github.com/airflow-helm/charts/tree/main/charts/airflow) available in the Airflow source distribution with the [Elyra sample configuration](https://raw.githubusercontent.com/elyra-ai/elyra/v2.1.0rc3/etc/kubernetes/airflow/helm/values.yaml).
+    - Use the [Helm chart](https://github.com/airflow-helm/charts/tree/main/charts/airflow) available in the Airflow source distribution with the [Elyra sample configuration](https://raw.githubusercontent.com/elyra-ai/elyra/master/etc/kubernetes/airflow/helm/values.yaml).
 
 OR  
 
@@ -75,7 +75,7 @@ To deploy Apache Airflow on a new Kubernetes cluster:
    kubectl create secret generic airflow-secret --from-file=id_rsa=.ssh/id_rsa --from-file=known_hosts=.ssh/known_hosts --from-file=id_rsa.pub=.ssh/id_rsa.pub -n airflow
    ```
 
-2. Download, review, and customize the [sample `helm` configuration](https://raw.githubusercontent.com/elyra-ai/elyra/v2.1.0rc3/etc/kubernetes/airflow/helm/values.yaml) (or customize an existing configuration):
+2. Download, review, and customize the [sample `helm` configuration](https://raw.githubusercontent.com/elyra-ai/elyra/master/etc/kubernetes/airflow/helm/values.yaml) (or customize an existing configuration):
    - Set `git.url` to the URL of the private repository you created earlier, e.g. `ssh://[email protected]/your-git-org/your-dag-repo`
    - Set `git.ref` to the DAG branch, e.g. `main`.
    - Set `git.secret` to the name of the secret you created, e.g. `airflow-secret`.
@@ -125,7 +125,7 @@ To deploy Apache Airflow on a new Kubernetes cluster:
      repository: elyra/airflow
    ```    
 
-   The container image is created using [this `Dockerfile`](https://github.com/elyra-ai/elyra/tree/v2.1.0rc3/etc/docker/airflow) and published on [Docker Hub](https://hub.docker.com/r/elyra/airflow) and [quay.io](https://quay.io/repository/elyra/airflow).
+   The container image is created using [this `Dockerfile`](https://github.com/elyra-ai/elyra/tree/master/etc/docker/airflow) and published on [Docker Hub](https://hub.docker.com/r/elyra/airflow) and [quay.io](https://quay.io/repository/elyra/airflow).
 
 3. Install Apache Airflow using the customized configuration.
 

diff --git a/docs/source/recipes/deploying-elyra-in-a-jupyterhub-environment.md b/docs/source/recipes/deploying-elyra-in-a-jupyterhub-environment.md
@@ -42,7 +42,7 @@ singleuser:
   image:
     name: elyra/elyra
     # change to a specific release version as appropriate
-    tag: 2.1.0rc3
+    tag: dev
     # disable this in a production environment
     pullPolicy: "Always"
   storage:
@@ -94,7 +94,7 @@ singleuser:
   image:
     name: elyra/elyra
     # change to a specific release version as appropriated
-    tag: 2.1.0rc3
+    tag: dev
     # disable this in a production environment
     pullPolicy: "Always"
   storage:
@@ -112,7 +112,7 @@ required to run elyra, and that could be used to customize your environment with
 packages required by your workloads, or any other customizations needed.
 
 ```dockerfile
-FROM elyra/elyra:2.1.0rc3
+FROM elyra/elyra:dev
 
 ...
 

diff --git a/elyra/_version.py b/elyra/_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = '2.1.0rc3'
+__version__ = '2.1.0.dev0'
diff --git a/etc/docker/elyra/Dockerfile b/etc/docker/elyra/Dockerfile
@@ -40,7 +40,7 @@ RUN conda remove --force -y terminado && \
     npm install -g yarn && \
     npm install -g npm && \
     cd /tmp && git clone https://github.com/elyra-ai/elyra.git && \
-    cd /tmp/elyra && git checkout tags/v2.1.0rc3 -b v2.1.0rc3 && make UPGRADE_STRATEGY=eager install && rm -rf /tmp/elyra
+    cd /tmp/elyra && make UPGRADE_STRATEGY=eager install && rm -rf /tmp/elyra
 
 CMD ["/usr/local/bin/start-elyra.sh"]
 
diff --git a/lerna.json b/lerna.json
@@ -1,17 +1,12 @@
 {
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {
     "publish": {
-      "ignoreChanges": [
-        "ignored-file",
-        "*.md"
-      ],
+      "ignoreChanges": ["ignored-file", "*.md"],
       "message": "chore(release): publish"
     }
   },
-  "packages": [
-    "packages/*"
-  ]
+  "packages": ["packages/*"]
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elyra",
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "private": true,
   "workspaces": {
     "packages": [

diff --git a/packages/code-snippet/package.json b/packages/code-snippet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elyra/code-snippet-extension",
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "description": "JupyterLab extension - Reusable code snippets for your Notebook and Python Scripts",
   "keywords": [
     "jupyter",
@@ -32,9 +32,9 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@elyra/metadata-common": "^2.1.0-rc.3",
-    "@elyra/services": "^2.1.0-rc.3",
-    "@elyra/ui-components": "^2.1.0-rc.3",
+    "@elyra/metadata-common": "^2.1.0-dev",
+    "@elyra/services": "^2.1.0-dev",
+    "@elyra/ui-components": "^2.1.0-dev",
     "@jupyterlab/application": "^3.0.0",
     "@jupyterlab/apputils": "^3.0.0",
     "@jupyterlab/cells": "^3.0.0",

diff --git a/packages/metadata-common/package.json b/packages/metadata-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elyra/metadata-common",
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "description": "JupyterLab - Widgets for interacting with metadata",
   "keywords": [
     "jupyter",
@@ -31,8 +31,8 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@elyra/services": "^2.1.0-rc.3",
-    "@elyra/ui-components": "^2.1.0-rc.3",
+    "@elyra/services": "^2.1.0-dev",
+    "@elyra/ui-components": "^2.1.0-dev",
     "@jupyterlab/application": "^3.0.0",
     "@jupyterlab/apputils": "^3.0.0",
     "@jupyterlab/codeeditor": "^3.0.0",

diff --git a/packages/metadata/package.json b/packages/metadata/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elyra/metadata-extension",
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "description": "JupyterLab extension - View and edit metadata",
   "keywords": [
     "jupyter",
@@ -32,8 +32,8 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@elyra/metadata-common": "^2.1.0-rc.3",
-    "@elyra/services": "^2.1.0-rc.3",
+    "@elyra/metadata-common": "^2.1.0-dev",
+    "@elyra/services": "^2.1.0-dev",
     "@jupyterlab/application": "^3.0.0",
     "@jupyterlab/apputils": "^3.0.0",
     "@jupyterlab/codeeditor": "^3.0.0",

diff --git a/packages/pipeline-editor/package.json b/packages/pipeline-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elyra/pipeline-editor-extension",
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "description": "JupyterLab extension - Visual editor to build Notebook pipelines",
   "keywords": [
     "jupyter",
@@ -35,9 +35,9 @@
   },
   "dependencies": {
     "@elyra/canvas": "^10.1.0",
-    "@elyra/metadata-common": "^2.1.0-rc.3",
-    "@elyra/services": "^2.1.0-rc.3",
-    "@elyra/ui-components": "^2.1.0-rc.3",
+    "@elyra/metadata-common": "^2.1.0-dev",
+    "@elyra/services": "^2.1.0-dev",
+    "@elyra/ui-components": "^2.1.0-dev",
     "@jupyterlab/application": "^3.0.0",
     "@jupyterlab/apputils": "^3.0.0",
     "@jupyterlab/coreutils": "^5.0.0",

diff --git a/packages/python-editor/package.json b/packages/python-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elyra/python-editor-extension",
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "description": "JupyterLab extension - Run python files using a kernel runtime",
   "keywords": [
     "jupyter",

diff --git a/packages/services/package.json b/packages/services/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elyra/services",
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "description": "JupyterLab - Utilities for use in elyra",
   "keywords": [
     "jupyter",

diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elyra/theme-extension",
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "description": "JupyterLab extension - Elyra theme",
   "keywords": [
     "jupyter",
@@ -32,7 +32,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@elyra/ui-components": "^2.1.0-rc.3",
+    "@elyra/ui-components": "^2.1.0-dev",
     "@jupyterlab/application": "^3.0.0",
     "@jupyterlab/apputils": "^3.0.0",
     "@jupyterlab/launcher": "^3.0.0",

diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts
@@ -121,7 +121,7 @@ const extension: JupyterFrontEndPlugin<ILauncher> = {
       label: 'Documentation',
       icon: helpIcon,
       execute: (args: any) => {
-        window.open('https://elyra.readthedocs.io/en/stable/', '_blank');
+        window.open('https://elyra.readthedocs.io/en/latest/', '_blank');
       }
     });
 

diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elyra/ui-components",
-  "version": "2.1.0-rc.3",
+  "version": "2.1.0-dev",
   "description": "JupyterLab - UI components for use in elyra",
   "keywords": [
     "jupyter",