Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Make pip installable #16

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
3e21908
Bring in BL current and history
mattloper Jul 11, 2014
9145ca8
Removed contexts/setup.py
mattloper Jul 12, 2014
b0f0ae4
Added num_channels to renderers. Colored renderer can now have that s…
mattloper Jul 14, 2014
84bc00f
lighting.py: added lambertian spotlight
mattloper Jul 15, 2014
8cc590f
Add generated stuff in contexts to .gitignore
algrs Jul 19, 2014
2c1b0ed
Switch to strict relative imports.
algrs Jul 19, 2014
b291e06
Replaced "assertTrue" with "assertGreater"/"assertLess" so we know ho…
mattloper Jul 19, 2014
9406134
loosened unit tests slightly for linux
mattloper Jul 19, 2014
12b544e
more loosening of unit tests for linux
mattloper Jul 19, 2014
0ff6c80
lighting.py: added camcoord option for lambertian spotlight
mattloper Jul 22, 2014
31bbe1d
topology.py: support non-watertight meshes
mattloper Jul 28, 2014
a2373a8
util_tests.py: fixed for __array_priority__ change
mattloper Jul 29, 2014
90025c0
Added fields to setup (like "description") and added README.txt
mattloper Jul 23, 2014
03df9d1
Makefile: added upload option
mattloper Jul 23, 2014
39667cd
setup.py: require chumpy >= .51
mattloper Jul 23, 2014
a0aa109
Attempt to fix cythonize problems for pip install
mattloper Jul 23, 2014
e47a8a0
Moved tests into main dir, to get rid of relative import madness.
mattloper Jul 23, 2014
cb9d4b7
Incremented version for pipy upload.
mattloper Jul 23, 2014
369d6ab
renderer.py: Added overdraw=True as default for BoundaryRenderer
mattloper Jul 23, 2014
2286686
setup.py: incremented version
mattloper Jul 23, 2014
8963b58
added matplotlib as a req, so that demos will run.
mattloper Jul 25, 2014
15d5a33
setup.py: added more information for pypi
mattloper Jul 26, 2014
a08f98c
README.txt: fixed some markdown
mattloper Jul 26, 2014
b5637e1
Don't compile mesa on mac, add cvwrap in case opencv isn't available,…
mattloper Aug 26, 2014
2880eae
Actually do what I meant to do in last commit
mattloper Aug 26, 2014
fd34422
Updated to make pyramids work with greyscale (ie renderer.num_channel…
mattloper Aug 28, 2014
64bdd86
__init__.py: updated demo('optimization') example
mattloper Aug 28, 2014
d8b15ce
test_renderer.py: fix import
mattloper Aug 28, 2014
2d3b7b2
Merge branch 'ml_master'
algrs Feb 24, 2015
cbf05de
Add double sided rendering to LambertianPointLight.
algrs Feb 24, 2015
7a89ea4
Fix to prev
algrs Feb 24, 2015
2861d82
Leave no pdb unturned
algrs Feb 25, 2015
d803386
Implement ProjectPoints.compute_r without calling cv2.projectPoints w…
Apr 21, 2015
99a126d
fix for tests
Apr 21, 2015
53c6de5
Failing test that changes to ProjectPoints didn't change anything
algrs Apr 21, 2015
b64493e
Return squeezed R for backward compatibility
Apr 27, 2015
7e0961e
Loosened tests slightly for buildbot
algrs May 18, 2015
8c61bdd
Remove monkey patch to setuptools that appears to no longer be necessary
algrs Jul 6, 2015
c521273
removed superflous copy operation in camera.unproject_points
Jul 24, 2015
aedc1e9
Merge mattloper into master
algrs Nov 12, 2015
ee00ad1
Fix bad zip downloads during install PR #1
Mar 17, 2016
c39ccf9
Fix of unit test bug PR #2
Mar 18, 2016
1a37333
Test in CircleCI (#4)
paulmelnikow May 30, 2016
479a143
Fix dependencies in setup.py and keep version consistent and RELEASE …
sonnyhu May 31, 2016
ca23ab6
Don't build until after dependencies are installed (#6)
paulmelnikow Jun 2, 2016
96675e6
Update chumpy (#7)
dlsmith Aug 1, 2016
9fbe867
relax requirement versions
algrs Apr 11, 2017
0785446
update to newest chumpy
algrs Apr 11, 2017
4414aa5
use more recent scipy in chumpy
algrs Apr 11, 2017
f5bf6a7
Fix tests in circle (#9)
algrs Apr 18, 2017
f2f11dc
use pypi chumpy
algrs Apr 26, 2017
270294d
Merge remote-tracking branch 'upstream/master'
algrs May 10, 2017
8eea8ab
Make pip installable
algrs May 10, 2017
ac12251
fix some lint
algrs May 10, 2017
9be7c09
fix more lint
algrs May 10, 2017
e01d7c4
fix more lint
algrs May 11, 2017
0173844
pylint disable in autogened _constants
algrs May 11, 2017
9687106
install chumpy from pypi in travis
algrs May 11, 2017
3ee98db
preinstall numpy and scipy in travis
algrs May 11, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't compile mesa on mac, add cvwrap in case opencv isn't available,…
… tolerate lack of cython, and added normalization option to VertNormals.
  • Loading branch information
mattloper committed Aug 26, 2014
commit b5637e1c3d42e606c5544bf02f56b4127b06b771
4 changes: 4 additions & 0 deletions cvwrap.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
try:
import cv2
except:
raise Exception('Failed to import cv2 from the OpenCV distribution. Please install OpenCV with Python support. OpenCV may either be installed from http://opencv.org or installed with package managers such as Homebrew (on Mac, http://brew.sh) or apt-get (on Ubuntu or Debian).')