Skip to content

Sip import fix #30

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Sip import fix #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eb2d5b3
A qtpy based compat.py solution and trash removal
Dec 15, 2016
7c1913d
Forgot compat
Dec 15, 2016
8b8fa69
requirements changes
Dec 15, 2016
c5a4d78
another attempt at a qtpy solution
Dec 16, 2016
382932c
Closing in on a solution
Dec 16, 2016
26cb990
Mixed results changing from Qbool to bool
Dec 18, 2016
3623e94
Changing 'bool' to bool and a few PEP8 tweaks
Dec 18, 2016
2c4cd0d
Fixed error in excpthook & removed some tests
Dec 18, 2016
455dd1b
Commented out from future stuff
Dec 19, 2016
e6dc204
attempting to run pytest from travis
Dec 19, 2016
5b52906
giving up on pytest through travis for now
Dec 19, 2016
5e37a63
operator fix and commenting out icons_rc useage
Dec 19, 2016
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
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ language: python
python:
- "3.5"
- "3.4"
- "3.3"
- "2.7"

before_install:
Expand Down Expand Up @@ -44,6 +43,8 @@ install:

script: echo "Done!"

# script: pytest tests

notifications:
email:
recipients:
Expand Down
3 changes: 1 addition & 2 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
recursive-include qtpandas *.py
recursive-include qtpandas/_lib *
recursive-include qtpandas/i18n *.qm
prune examples/sample?/build/tests
prune examples/sample?/build/tests
Copy link
Owner Author

@draperjames draperjames Dec 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted this line b/c I deleted the corresponding directory.

183 changes: 0 additions & 183 deletions doc/Makefile
View file
Open in desktop

This file was deleted.

Loading