Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
bernhard-42 committed Aug 21, 2022
1 parent 303ab29 commit 6dac4f6
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 11 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## Release v3.2.2 (21.08.2022)

No feature change, change dependency to cad-viewer-widget 1.3.5 which fixes using ipywidgets 7.7.2

## Release v3.2.1 (20.08.2022)

No feature change, just re-released 3.2.0 since a deployment error happened with 3.2.0 to Pypi

## Release v3.2.0 (13.08.2022)

### New features:
Expand Down
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ _Jupyter-CadQuery_ is now a 3 layer project:
- Click on tree labels shows bounding box info and optionally hides or isolates the sub tree


## Release v3.2.2 (21.08.2022)

No feature change, change dependency to cad-viewer-widget 1.3.5 which fixes using ipywidgets 7.7.2


## Release v3.2.1 (20.08.2022)

No feature change, just re-released 3.2.0 since a deployment error happened with 3.2.0 to Pypi
Expand Down Expand Up @@ -121,8 +126,7 @@ No feature change, just re-released 3.2.0 since a deployment error happened with
- Install _Jupyter-CadQuery_ (note, matplotlib is only used for the examples)

```bash
pip install jupyterlab jupyterlab-widgets==1.1.1 # ensure ipywidgets 7.7 is still supported
pip install jupyter-cadquery==3.2.1 cadquery-massembly==1.0.0rc0 matplotlib
pip install jupyter-cadquery==3.2.2 cadquery-massembly==1.0.0rc0 matplotlib
```

Windows users should also install `pywin32` again with `conda` to ensure it is configured correctly
Expand Down Expand Up @@ -176,14 +180,14 @@ No feature change, just re-released 3.2.0 since a deployment error happened with
```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.2.1
docker run -it --rm -v $WORKDIR:/home/cq -p 8888:8888 bwalter42/jupyter_cadquery:3.2.2
```

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.2.1` or
- omit the volume mapping and just run `docker run -it --rm -p 8888:8888 bwalter42/jupyter_cadquery:3.2.2` 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 @@ -193,7 +197,7 @@ No feature change, just re-released 3.2.0 since a deployment error happened with
- 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.2.1 -v
docker run -it --rm -p 8888:8888 --name jcq -p 5555:5555 bwalter42/jupyter_cadquery:3.2.2 -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 @@ -17,7 +17,7 @@ RUN mamba install -n cq -y -c conda-forge -c cadquery cadquery=master && \

RUN . "/opt/conda/etc/profile.d/conda.sh" && conda activate cq && \
pip install jupyterlab jupyterlab-widgets==1.1.1 && \
pip install jupyter-cadquery==3.2.1 cadquery-massembly~=1.0.0rc0 jupyterlab~=3.4.3 voila~=0.3.5 && \
pip install jupyter-cadquery==3.2.2 cadquery-massembly~=1.0.0rc0 jupyterlab~=3.4.3 voila~=0.3.5 && \
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,5 +8,5 @@ dependencies:
- cadquery=master
- matplotlib=3.3
- pip:
- jupyter-cadquery==3.2.1
- jupyter-cadquery==3.2.2
- cadquery-massembly==1.0.0rc0
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.2.1" # DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion
__version__ = "3.2.2" # DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion
__version_info__ = get_version(__version__)
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.2.1
current_version = 3.2.2
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<release>\D*)(?P<build>\d*)
Expand Down Expand Up @@ -33,4 +33,3 @@ parse = jupyter-cadquery=(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<relea

[bumpversion:file:environment.yml]
parse = jupyter-cadquery==(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<release>\D*)(?P<build>\d*)

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.2.1",
"version": "3.2.2",
"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 6dac4f6

Please sign in to comment.