Skip to content

Commit 6edcdd2

Browse files
skidzoskidzo
authored
Merge pull request tpaviot#1 from tpaviot/master
update
2 parents 30eade4 + 4646e7d commit 6edcdd2

File tree

2,664 files changed

+201344
-2866753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,664 files changed

+201344
-2866753
lines changed

‎.gitignore‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ coverage.xml
3838
# Translations
3939
*.mo
4040

41-
# Mr Developer
41+
# Mr Developer and other IDE stuff
4242
.mr.developer.cfg
4343
.project
4444
.pydevproject
4545
.idea/
46+
.vs/
4647
workspace.xml
4748

4849
# Rope
@@ -55,3 +56,11 @@ workspace.xml
5556
# Sphinx documentation
5657
_build/
5758

59+
# OS generated files
60+
.DS_Store
61+
.DS_Store?
62+
._*
63+
.Spotlight-V100
64+
.Trashes
65+
ehthumbs.db
66+
Thumbs.db

‎.gitmodules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "demos"]
2+
path = demos
3+
url = https://github.com/tpaviot/pythonocc-demos
4+
branch = master

‎.travis.yml‎

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,29 @@ language: cpp
55
cache:
66
apt: true
77

8+
git:
9+
depth: false
10+
811
# the secure below is the binstar token
912
# to genrate this secure
1013
# first create an anconda cloud token
1114
# $ anaconda auth -n the_token_name --max-age 22896000 -c --scopes api
1215
# the token is return as something like "yh-6654-12334_111225"
1316
# then encrypt the token
17+
# Note : in order to encrypt using travis
18+
# You may have to :
19+
# $ sudo gem install travis
20+
# (especially if you performed a linux distro upgrade, ruby should not be up to date)
1421
# You have to be in the directory where you installed the local copy of the repository
1522
# $ cd [your_dev_dir]/pythonocc-core
16-
# $ travis encrypt BINSTAR_TOKEN="yh-6654-12334_111225"
23+
# $ sudo travis encrypt BINSTAR_TOKEN="yh-6654-12334_111225"
1724
# !!be careful about the typo BINSTAR_TOKEN with the proper case. Otherwise
1825
# !!the $BINSTAR_TOKEN env var value will be null and the line
1926
# !!anaconda -t $BINSTAR_TOKEN upload *.bz2 will not be run properly
2027
# after that, copy/paste the secure on the following line
2128
env:
2229
global:
23-
- secure: "XObUZlAdB3tRpDtd0z0LaxbOnkpiulNloSevDl5g8+Z3bsBk6jX0GTkVKSryxwe2H7v+YE8crShPykBvi/MlbXOy5S2nO/PjDxJFBQDsGFygrpOnjJ2bZ0IWSLeHADwVoiZZC2yHmkcaq+c5h/fFNyepfai42jhNLFR69adXOSk="
30+
- secure: "Bqor4TrYqeJUkjiIHjCq/e3xt/jAoU3Q5kwG/ej+QxaiT6hmkirX3Io3rHxNTbS+mYMAMTbtkkpGqYIYIYtNVx8jGYLdwOzNcuW/wzZf9VuAW/rnjx2lzuYRhHk3GOylSPUU06JHvXDmZvdMxetNBeWaE5hGuJsC9liA+stDepA="
2431

2532
addons:
2633
apt:
@@ -31,35 +38,46 @@ addons:
3138
- g++-multilib
3239
- lib32z1+
3340
- lsb-core
34-
- g++-5
41+
- g++-7
3542

3643
matrix:
3744
include:
3845
- env: PYTHON="2.7" CONDA_PY=27 ARCH="x86_64"
3946
os: linux
4047
dist: trusty
41-
- env: PYTHON="2.7" CONDA_PY=27 ARCH="x86_64" MACOSX_DEPLOYMENT_TARGET="10.9"
48+
- env: PYTHON="2.7" CONDA_PY=27 ARCH="x86_64"
4249
os: osx
43-
osx_image: xcode8.3
50+
osx_image: xcode9.4
4451
- env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64"
4552
os: linux
4653
dist: trusty
47-
- env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64" MACOSX_DEPLOYMENT_TARGET="10.9"
54+
- env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64"
4855
os: osx
49-
osx_image: xcode8.3
56+
osx_image: xcode9.4
5057
- env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64"
5158
os: linux
5259
dist: trusty
53-
- env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64" MACOSX_DEPLOYMENT_TARGET="10.9"
60+
- env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64"
5461
os: osx
55-
osx_image: xcode8.3
62+
osx_image: xcode9.4
63+
- env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64"
64+
os: linux
65+
dist: trusty
66+
- env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64"
67+
os: osx
68+
osx_image: xcode9.4
69+
allow_failures:
70+
- env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64"
71+
os: osx
72+
osx_image: xcode9.4
5673
# Use miniconda to install binary versions of numpy etc. from continuum
5774
# analytic's repository. Follows an approach described by Dan Blanchard:
5875
# https://gist.github.com/dan-blanchard/7045057
5976
before_install:
77+
- git submodule update --init --remote --recursive
6078
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
61-
export CXX=g++-5;
62-
export CC=gcc-5;
79+
export CXX=g++-7;
80+
export CC=gcc-7;
6381
fi;
6482
- if [ ${PYTHON:0:1} == "2" ]; then
6583
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
@@ -83,6 +101,11 @@ before_install:
83101
- hash -r
84102
- conda config --set always_yes yes --set changeps1 no
85103
- conda update -q conda
104+
# install everything required to build the receipe
105+
# conda-build 3.2.0 on osx to prevent using check_overlinking
106+
# method which is quite loooong to process
107+
- conda install conda-build==3.2.0
108+
- conda install anaconda-client
86109
# Useful for debugging any issues with conda
87110
- conda info -a
88111
# download/install OCE from DLR-SC channel
@@ -91,23 +114,25 @@ before_install:
91114
- conda config --add channels https://conda.anaconda.org/tpaviot
92115
- conda config --add channels https://conda.anaconda.org/oce
93116
- conda config --add channels https://conda.anaconda.org/pythonocc
94-
# install everything required to build the receipe
95-
- conda install conda-build anaconda-client
117+
96118

97119

98120
script:
99-
- conda build ci/conda --no-remove-work-dir
121+
- conda build ci/conda --dirty --no-remove-work-dir
100122

101123
# automative upload to anaconda cloud only
102124
# if the build was triggered by a cron
103-
# that was only nightly builds are uploaded
104-
# in case of a relase, replace the "nightly" label with "main"
125+
# labelled as "nightly"
126+
# else labelled as "continuous-delivery"
105127
after_success:
106128
- python ci/move-conda-package.py
107129
- if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then
108-
anaconda -t $BINSTAR_TOKEN upload *.bz2 --force;
130+
anaconda -t $BINSTAR_TOKEN upload *.bz2 -l nightly-master --force;
131+
else
132+
anaconda -t $BINSTAR_TOKEN upload *.bz2 -l cd-$TRAVIS_BRANCH --force;
109133
fi;
110134

135+
111136
branches:
112137
only:
113138
- master

‎AUTHORS‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
pythonOCC is developed and maintained by Thomas Paviot (tpaviot@gmail.com).
22

3-
pythonOCC-core contains contributions from :
4-
* Jelle Feringa (jelleferinga@gmail.com): conda build for OSX, examples, PyQt5 support
5-
* Guillaume Florent (florentsailing@gmail.com): geometry airfoil example.
6-
* Martin Siggel (martin.siggel@dlr.de): conda recipes for linux/windows, wrapper fixes,
7-
matplotlib examples.
3+
The pythonocc-core package contains contributions from :
4+
5+
Adam Urbańczyk
6+
François Granade
7+
Hinko Kočevar
8+
Jelle Feringa
9+
Jeremy Wright
10+
Martin Siggel
11+
Matthis Thorade
12+
Thomas Krijnen
13+
Thomas Paviot
14+
Trevor Laughlin
15+
jelle feringa
16+
nxsofsys
17+
Thomas Severin

0 commit comments

Comments
 (0)