Skip to content

Commit

Permalink
Latest release: 3.1.0rc4
Browse files Browse the repository at this point in the history
  • Loading branch information
bernhard-42 committed May 15, 2022
1 parent 0a9959c commit ff77385
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ dependencies:
- cadquery=master
- matplotlib=3.3
- pip:
- jupyter-cadquery==3.1.0rc3
- jupyter-cadquery==3.1.0rc4
2 changes: 1 addition & 1 deletion jupyter_cadquery/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.1.0rc3
current_version = 3.1.0rc4
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<release>\D*)(?P<build>\d*)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit ff77385

Please sign in to comment.