Skip to content

Commit

Permalink
Merge pull request #384 from tpaviot/review/release-0.17.2
Browse files Browse the repository at this point in the history
Set Version number to 0.17.2; update NEWS and README.md
  • Loading branch information
tpaviot authored Jan 10, 2017
2 parents 244c6d2 + ee97220 commit 5d4c072
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 13 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@ script:
# in case of a relase, replace the "nightly" label with "main"
after_success:
- python ci/move-conda-package.py
- if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then
anaconda -t $BINSTAR_TOKEN upload *.bz2 --force;
fi;
- anaconda -t $BINSTAR_TOKEN upload *.bz2 --force

branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set(PYTHONOCC_VERSION_MAJOR 0)
set(PYTHONOCC_VERSION_MINOR 17)
set(PYTHONOCC_VERSION_PATCH 2)
# Empty for official releases, set to -dev, -rc1, etc for development releases
set(PYTHONOCC_VERSION_DEVEL -dev)
set(PYTHONOCC_VERSION_DEVEL)

cmake_minimum_required(VERSION 2.6)

Expand Down
20 changes: 20 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
=============================
Version 0.17.2 - January 2017

This release requires oce-0.17.0 or oce-0.17.1 or oce-0.17.2. Prefer the latter.

* webgl: upgrade three.js to r83; use https for three.js library

* webgl: X3D quality improvements; use https; replaced IndexedFaceSet with TriangleSet

* examples: added point cloud and glsl examples

* gui: osx qtDisplay supports Retina displays

* gui: fixed a regression in qtDisplay

* gui: fixed PySide support

* ci/cd: travis upoads nightly builds to http://anaconda.com/tpaviot, conda packages
on appveyor are available for download as artifacts

=============================
Version 0.17.1 - December 2016

Expand Down
15 changes: 11 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pythonocc is a python library whose purpose is to provide 3D modeling
features. It is intended to developers who aim at developing
CAD/PDM/PLM applications.

Latest release : [pythonocc-core 0.17.1 (december 2016)](https://github.com/tpaviot/pythonocc-core/releases/tag/0.17.1)
Latest release : [pythonocc-core 0.17.2 (january 2017)](https://github.com/tpaviot/pythonocc-core/releases/tag/0.17.2)

How to quicky download/install binaries ?
-----------------------------------------
Expand All @@ -24,7 +24,12 @@ This will get you up and running in minutes whether you run win32/win64/linux64/

```bash
# install pythonocc in an environment named `pythonocc` with python 3.5; use python=2 for legacy python 2.7.12
conda create -n pythonocc -c pythonocc -c dlr-sc pythonocc-core==0.17.1 python=3
conda create -n pythonocc -c pythonocc -c dlr-sc pythonocc-core==0.17.2 python=3
```

Nightly builds are available from another repository. If you want to test features under development that have not been released yet:
```bash
conda install -c tpaviot -c dlr-sc pythonocc-core==nightly
```

How to compile ?
Expand All @@ -51,8 +56,10 @@ We use the following online resources:
https://travis-ci.org/tpaviot/pythonocc-core
* Twitter
https://twitter.com/pythonocc
* Anaconda cloud
* Anaconda cloud repository for official releases
https://anaconda.org/pythonocc
* Anaconda cloud repository for nightly builds
https://anaconda.org/tpaviot/pythonocc-core

how do __oce__ and __pythonocc__ relate?
----------------------------------------
Expand All @@ -61,7 +68,7 @@ The basis of pythonocc is python wrapper for the [oce C++ library / CAD kernel]
(https://github.com/tpaviot/oce), aka pythonocc-core.
pythonocc-core version number correspond to oce library releases its wrapping.

For example; the current pythonocc-core release, 0.17.1, requires any of the [OCE
For example; the current pythonocc-core release, 0.17.2, requires any of the [OCE
0.17.x](https://github.com/tpaviot/oce/releases) releases. Here, the __Major__
version name of either OCE or pythonocc-core release is __0__, the __Minor__
version is __17__ and the __Patch__ version is (optionally) __x__. pythonocc-core can be built with any OCE version that has a corresponding __Major__ and __Minor__ version
Expand Down
9 changes: 5 additions & 4 deletions ci/conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# change the version numer to "0.17.1" or "0.18" in cas of a release build
package:
name: pythonocc-core
version: "nightly"
version: 0.17.2

source:
path: ../..
fn: 0.17.2.tar.gz
url: https://github.com/tpaviot/pythonocc-core/archive/0.17.2.tar.gz
patches:
- fix_graphicshr_location.patch [win]
- fix_GeomFill_BSplineCurves_Init_method.patch
Expand All @@ -14,7 +15,7 @@ build:
- CC
- CXX

number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
number: 1
binary_relocation: false [osx]
features:
- vc9 [win and py27]
Expand Down Expand Up @@ -46,4 +47,4 @@ test:
about:
home: https://github.com/tpaviot/pythonocc-core
license: LGPL
summary: A python wrapper for the OCE library
summary: An industrial strength 3D CAD python package
2 changes: 1 addition & 1 deletion cmake/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "0.17.2-dev"
VERSION = "0.17.2"

0 comments on commit 5d4c072

Please sign in to comment.