Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: draperjames/qtpandas
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: draperjames/qtpandas
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: sip_import_fix
Choose a head ref
  • 12 commits
  • 27 files changed
  • 1 contributor

Commits on Dec 15, 2016

  1. A qtpy based compat.py solution and trash removal 

    changed compat.py to rely on the qtpy package and deleted some of the
files listed in #7
    James Draper committed Dec 15, 2016
    Configuration menu
    Copy the full SHA
    eb2d5b3 View commit details
    Browse the repository at this point in the history

  2. Forgot compat

    James Draper committed Dec 15, 2016
    Configuration menu
    Copy the full SHA
    7c1913d View commit details
    Browse the repository at this point in the history

  3. requirements changes 

    Added qtpy to reqirements, cleaned up compat.py
    James Draper committed Dec 15, 2016
    Configuration menu
    Copy the full SHA
    8b8fa69 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2016

  1. another attempt at a qtpy solution 

    HOTTIP: delete one thing at a time
Don't be like me if you need to remove somethings do it methodically.
    James Draper committed Dec 16, 2016
    Configuration menu
    Copy the full SHA
    c5a4d78 View commit details
    Browse the repository at this point in the history

  2. Closing in on a solution 

    Moved the contents of test/main.py to test/test_DataFrameModelManager.py
that way I can actually run the tests after a fresh install. Commented
out some requirements in setup.py.
    James Draper committed Dec 16, 2016
    Configuration menu
    Copy the full SHA
    382932c View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2016

  1. Mixed results changing from Qbool to bool

    James Draper committed Dec 18, 2016
    Configuration menu
    Copy the full SHA
    26cb990 View commit details
    Browse the repository at this point in the history

  2. Changing 'bool' to bool and a few PEP8 tweaks 

    I realized that I changed 'QBool' to 'bool' when it probably should have
been just bool.
    James Draper committed Dec 18, 2016
    1 Configuration menu
    Copy the full SHA
    3623e94 View commit details
    Browse the repository at this point in the history

  3. Fixed error in excpthook & removed some tests

    James Draper committed Dec 18, 2016
    Configuration menu
    Copy the full SHA
    2c4cd0d View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2016

  1. Commented out from future stuff

    James Draper committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    455dd1b View commit details
    Browse the repository at this point in the history

  2. attempting to run pytest from travis

    James Draper committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    e6dc204 View commit details
    Browse the repository at this point in the history

  3. giving up on pytest through travis for now

    James Draper committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    5b52906 View commit details
    Browse the repository at this point in the history

  4. operator fix and commenting out icons_rc useage

    James Draper committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    5e37a63 View commit details
    Browse the repository at this point in the history
Loading