From ff773855f480624f30ae7bf874e728ec9ebddd68 Mon Sep 17 00:00:00 2001 From: Bernhard Date: Sun, 15 May 2022 19:43:12 +0200 Subject: [PATCH] Latest release: 3.1.0rc4 --- README.md | 10 +++++----- docker/Dockerfile | 2 +- environment.yml | 2 +- jupyter_cadquery/_version.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1d5a4f3..c54a837 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ _Jupyter-CadQuery_ is now a 3 layer project: -## Release v3.1.0rc3 (23.04.2022) +## Release v3.1.0rc4 (23.04.2022) ### New features: @@ -150,7 +150,7 @@ _Jupyter-CadQuery_ is now a 3 layer project: ``` - Install _Jupyter-CadQuery_ (note, matplotlib is only used for the examples) ```bash - pip install jupyter-cadquery==3.1.0rc3 matplotlib + pip install jupyter-cadquery==3.1.0rc4 matplotlib ``` Windows users should also install `pywin32` again with `conda` to ensure it is configured correctly ```bash @@ -202,14 +202,14 @@ _Jupyter-CadQuery_ is now a 3 layer project: ```bash WORKDIR=/tmp/jupyter mkdir -p "$WORKDIR" # this has to exist, otherwise an access error will be thrown - docker run -it --rm -v $WORKDIR:/home/cq -p 8888:8888 bwalter42/jupyter_cadquery:3.1.0rc3 + docker run -it --rm -v $WORKDIR:/home/cq -p 8888:8888 bwalter42/jupyter_cadquery:3.1.0rc4 ``` Jupyter in the container will start in directory `/home/cq` - To start with examples, you can - - omit the volume mapping and just run `docker run -it --rm -p 8888:8888 bwalter42/jupyter_cadquery:3.1.0rc3` or + - omit the volume mapping and just run `docker run -it --rm -p 8888:8888 bwalter42/jupyter_cadquery:3.1.0rc4` or - copy the example notebooks to your `$WORKDIR`. They will be available for _Jupyter-CadQuery_ in the container. - If you want to change the Dockerfile, `make docker` will create a new docker image @@ -219,7 +219,7 @@ _Jupyter-CadQuery_ is now a 3 layer project: - Start the browser based viewer (eventually add cli options, see notes below): ```bash - docker run -it --rm -p 8888:8888 --name jcq -p 5555:5555 bwalter42/jupyter_cadquery:3.1.0rc3 -v + docker run -it --rm -p 8888:8888 --name jcq -p 5555:5555 bwalter42/jupyter_cadquery:3.1.0rc4 -v ``` - In your code import the `show` or `show_object` function from the viewer: diff --git a/docker/Dockerfile b/docker/Dockerfile index 0492d05..918c881 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ RUN mamba install -n cq -y -c conda-forge -c cadquery cadquery=master && \ find / -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete RUN . "/opt/conda/etc/profile.d/conda.sh" && conda activate cq && \ - pip install jupyter-cadquery==3.1.0rc3 cadquery-massembly~=0.9 jupyterlab~=3.3 voila~=0.3 && \ + pip install jupyter-cadquery==3.1.0rc4 cadquery-massembly~=0.9 jupyterlab~=3.3 voila~=0.3 && \ find / -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete VOLUME /home/cq/ diff --git a/environment.yml b/environment.yml index 0cd3fc7..97e4166 100644 --- a/environment.yml +++ b/environment.yml @@ -8,4 +8,4 @@ dependencies: - cadquery=master - matplotlib=3.3 - pip: - - jupyter-cadquery==3.1.0rc3 + - jupyter-cadquery==3.1.0rc4 diff --git a/jupyter_cadquery/_version.py b/jupyter_cadquery/_version.py index 35247da..a6a49fd 100644 --- a/jupyter_cadquery/_version.py +++ b/jupyter_cadquery/_version.py @@ -26,5 +26,5 @@ def get_version(version): return VersionInfo(major, minor, patch, release, build) -__version__ = "3.1.0rc3" # DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion +__version__ = "3.1.0rc4" # DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion __version_info__ = get_version(__version__) diff --git a/setup.cfg b/setup.cfg index 1591ab2..2585ad3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.1.0rc3 +current_version = 3.1.0rc4 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(?P\D*)(?P\d*) diff --git a/setup.py b/setup.py index 99dae72..f46b7a3 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setup_args = { "name": "jupyter_cadquery", - "version": "3.1.0rc3", + "version": "3.1.0rc4", "description": "An extension to render cadquery objects in JupyterLab via pythreejs", "long_description": LONG_DESCRIPTION, "include_package_data": True,