Skip to content

Commit

Permalink
Prepare for next development iteration
Browse files Browse the repository at this point in the history
  • Loading branch information
lresende committed Sep 24, 2020
1 parent 29530a6 commit e7ee59a
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.2.1
current_version = 1.3.0.dev0
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<build>\d+))?
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SHELL:=/bin/bash
GIT_VERSION:=0.21.1
TOC_VERSION:=4.0.0

TAG:=1.2.1
TAG:=dev
IMAGE=elyra/elyra:$(TAG)

# Contains the set of commands required to be used by elyra
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,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:1.2.1 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:1.2.1 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
Expand Down Expand Up @@ -127,7 +127,7 @@ Should output:
config dir: /usr/local/etc/jupyter
elyra enabled
- Validating...
elyra v1.2.1 OK
elyra <VERSION> OK
jupyterlab enabled
- Validating...
jupyterlab 2.2.2 OK
Expand All @@ -145,11 +145,11 @@ Should output:
```
Known labextensions:
app dir: /.../share/jupyter/lab
@elyra/code-snippet-extension v1.2.1 enabled OK*
@elyra/metadata-extension v1.2.1 enabled OK*
@elyra/pipeline-editor-extension v1.2.1 enabled OK*
@elyra/python-editor-extension v1.2.1 enabled OK*
@elyra/theme-extension v1.2.1 enabled OK*
@elyra/code-snippet-extension <VERSION> enabled OK*
@elyra/metadata-extension <VERSION> enabled OK*
@elyra/pipeline-editor-extension <VERSION> enabled OK*
@elyra/python-editor-extension <VERSION> enabled OK*
@elyra/theme-extension <VERSION> enabled OK*
@jupyterlab/git v0.21.1 enabled OK
@jupyterlab/toc v4.0.0 enabled OK
nbdime-jupyterlab v2.0.0 enabled OK
Expand Down
18 changes: 9 additions & 9 deletions docs/source/getting_started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Should output:
config dir: /usr/local/etc/jupyter
elyra enabled
- Validating...
elyra v1.2.1 OK
elyra <VERSION> OK
jupyterlab enabled
- Validating...
jupyterlab 2.2.2 OK
Expand All @@ -95,11 +95,11 @@ Should output:
```
Known labextensions:
app dir: /.../share/jupyter/lab
@elyra/code-snippet-extension v1.2.1 enabled OK*
@elyra/metadata-extension v1.2.1 enabled OK*
@elyra/pipeline-editor-extension v1.2.1 enabled OK*
@elyra/python-editor-extension v1.2.1 enabled OK*
@elyra/theme-extension v1.2.1 enabled OK*
@elyra/code-snippet-extension <VERSION> enabled OK*
@elyra/metadata-extension <VERSION> enabled OK*
@elyra/pipeline-editor-extension <VERSION> enabled OK*
@elyra/python-editor-extension <VERSION> enabled OK*
@elyra/theme-extension <VERSION> enabled OK*
@jupyterlab/git v0.21.1 enabled OK
@jupyterlab/toc v4.0.0 enabled OK
nbdime-jupyterlab v2.0.0 enabled OK
Expand All @@ -125,7 +125,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:1.2.1 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.
Expand All @@ -137,7 +137,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:1.2.1 jupyter lab --debug
elyra/elyra:dev jupyter lab --debug
```

Open the displayed URL in your browser to start using JupyterLab and Elyra.
Expand All @@ -153,4 +153,4 @@ Open the displayed URL in your browser to start using JupyterLab and Elyra.

### Red Hat OpenShift

JupyterLab and Elyra are included in the Open Data Hub community operator. Follow the instructions in [this document](/recipes/deploying-elyra-with-opendatahub.md) to deploy the operator in a Red Hat OpenShift cluster.
JupyterLab and Elyra are included in the Open Data Hub community operator. Follow the instructions in [this document](/recipes/deploying-elyra-with-opendatahub.md) to deploy the operator in a Red Hat OpenShift cluster.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ singleuser:
image:
name: elyra/elyra
# change to a specific release version as appropriate
tag: 1.2.1
tag: dev
# disable this in a production environment
pullPolicy: "Always"
storage:
Expand Down Expand Up @@ -94,7 +94,7 @@ singleuser:
image:
name: elyra/elyra
# change to a specific release version as appropriated
tag: 1.2.1
tag: dev
# disable this in a production environment
pullPolicy: "Always"
storage:
Expand All @@ -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:1.2.1
FROM elyra/elyra:dev

...

Expand Down
2 changes: 1 addition & 1 deletion elyra/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
__version__ = '1.2.1'
__version__ = '1.3.0.dev0'
2 changes: 1 addition & 1 deletion etc/docker/elyra/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/v1.2.1 -b v1.2.1 && \
cd /tmp/elyra && \
make UPGRADE_STRATEGY=eager install && \
rm -rf /tmp/elyra

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.1",
"version": "1.3.0-dev",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "elyra",
"version": "1.2.1",
"version": "1.3.0-dev",
"private": true,
"workspaces": {
"packages": [
Expand Down
4 changes: 2 additions & 2 deletions packages/application/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elyra/application",
"version": "1.2.1",
"version": "1.3.0-dev",
"description": "JupyterLab - Utilities for use in elyra",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -30,7 +30,7 @@
"watch": "tsc -w"
},
"dependencies": {
"@elyra/ui-components": "^1.2.1",
"@elyra/ui-components": "^1.3.0-dev",
"@jupyterlab/apputils": "^2.0.2",
"@jupyterlab/coreutils": "^4.0.2",
"@jupyterlab/services": "^5.0.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/code-snippet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elyra/code-snippet-extension",
"version": "1.2.1",
"version": "1.3.0-dev",
"description": "JupyterLab extension - Reusable code snippets for your Notebook and Python Scripts",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -31,9 +31,9 @@
"watch": "tsc -w"
},
"dependencies": {
"@elyra/application": "^1.2.1",
"@elyra/metadata-common": "^1.2.1",
"@elyra/ui-components": "^1.2.1",
"@elyra/application": "^1.3.0-dev",
"@elyra/metadata-common": "^1.3.0-dev",
"@elyra/ui-components": "^1.3.0-dev",
"@jupyterlab/application": "^2.0.2",
"@jupyterlab/apputils": "^2.0.2",
"@jupyterlab/cells": "^2.0.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/metadata-common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elyra/metadata-common",
"version": "1.2.1",
"version": "1.3.0-dev",
"description": "JupyterLab - Widgets for interacting with metadata",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -31,8 +31,8 @@
},
"dependencies": {
"@blueprintjs/core": "^3.22.2",
"@elyra/application": "^1.2.1",
"@elyra/ui-components": "^1.2.1",
"@elyra/application": "^1.3.0-dev",
"@elyra/ui-components": "^1.3.0-dev",
"@jupyterlab/application": "^2.0.2",
"@jupyterlab/apputils": "^2.0.2",
"@jupyterlab/codeeditor": "^2.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/metadata/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elyra/metadata-extension",
"version": "1.2.1",
"version": "1.3.0-dev",
"description": "JupyterLab extension - View and edit metadata",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -31,7 +31,7 @@
"watch": "tsc -w"
},
"dependencies": {
"@elyra/metadata-common": "^1.2.1",
"@elyra/metadata-common": "^1.3.0-dev",
"@jupyterlab/application": "^2.0.2",
"@jupyterlab/apputils": "^2.0.2",
"@jupyterlab/codeeditor": "^2.0.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/pipeline-editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elyra/pipeline-editor-extension",
"version": "1.2.1",
"version": "1.3.0-dev",
"description": "JupyterLab extension - Visual editor to build Notebook pipelines",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -33,10 +33,10 @@
"watch": "tsc -w"
},
"dependencies": {
"@elyra/application": "^1.2.1",
"@elyra/application": "^1.3.0-dev",
"@elyra/canvas": "9.0.3",
"@elyra/metadata-common": "^1.2.1",
"@elyra/ui-components": "^1.2.1",
"@elyra/metadata-common": "^1.3.0-dev",
"@elyra/ui-components": "^1.3.0-dev",
"@jupyterlab/application": "^2.0.2",
"@jupyterlab/apputils": "^2.0.2",
"@jupyterlab/docregistry": "^2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/python-editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elyra/python-editor-extension",
"version": "1.2.1",
"version": "1.3.0-dev",
"description": "JupyterLab extension - Run python files using a kernel runtime",
"keywords": [
"jupyter",
Expand Down
4 changes: 2 additions & 2 deletions packages/theme/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elyra/theme-extension",
"version": "1.2.1",
"version": "1.3.0-dev",
"description": "JupyterLab extension - Elyra theme",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -31,7 +31,7 @@
"watch": "tsc -w"
},
"dependencies": {
"@elyra/ui-components": "^1.2.1",
"@elyra/ui-components": "^1.3.0-dev",
"@jupyterlab/application": "^2.0.2",
"@jupyterlab/launcher": "^2.0.2",
"@jupyterlab/mainmenu": "^2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elyra/ui-components",
"version": "1.2.1",
"version": "1.3.0-dev",
"description": "JupyterLab - UI components for use in elyra",
"keywords": [
"jupyter",
Expand Down

0 comments on commit e7ee59a

Please sign in to comment.