Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b37e0b7

Browse files
sindunuragarpsindunuragarp
committed
Merge branch 'master' into refactor_markers
2 parents 8f86eb6 + 8b6f634 commit b37e0b7

82 files changed

Lines changed: 1046 additions & 130 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,12 @@ before_install:
102102
fi
103103
104104
install:
105+
# Upgrade pip and setuptools. Mock has issues with the default version of
106+
# setuptools
105107
- |
106108
# Setup environment
107109
ccache -s
110+
git describe
108111
# Upgrade pip and setuptools and wheel to get as clean an install as possible
109112
pip install --upgrade pip
110113
pip install --upgrade wheel

‎doc-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Install the documentation requirements with:
77
# pip install -r doc-requirements.txt
88
#
9-
sphinx>1.3,!=1.5.0
9+
sphinx>=1.3,!=1.5.0
1010
numpydoc
1111
ipython
1212
mock

‎doc/users/artists.rst‎

Lines changed: 1 addition & 1 deletion

‎doc/users/dflt_style_changes.rst‎

Lines changed: 1 addition & 0 deletions

‎doc/users/screenshots.rst‎

Lines changed: 1 addition & 1 deletion

‎examples/api/power_norm_demo.py‎

100755100644
File mode changed.

‎examples/event_handling/keypress_demo.py‎

100755100644
File mode changed.

‎examples/event_handling/pick_event_demo.py‎

100755100644
File mode changed.

‎examples/event_handling/pipong.py‎

100755100644
File mode changed.

‎examples/event_handling/pong_gtk.py‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)