Skip to content
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.

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

Testing: Use Qt/PyQt 5.6 packages in Travis #3340

Closed
wants to merge 2 commits into from

Conversation

mingwandroid
Copy link

Before submitting your pull request be sure that:

  1. You haven't touched any file in the spyderlib/defaults directory.
    • There is absolutely no need to touch those files.
    • If you want to add new configuration options, please go to
      spyderlib/config/main.py.
  2. You haven't eliminated unnecessary blank lines or spaces during your work.
    That makes our reviewing work harder and it could introduce unnecessary
    conflicts with other pull requests.
  3. You haven't added new icons to Spyder. Please leave decisions about what
    icons to use to us :)

Note: You can safely remove this text before submitting your work.

Bumped this message to kick Travis off again
@@ -63,11 +66,8 @@ install_conda()

install_pip()
{
if [ "$USE_QT_API" = "PyQt5" ]; then
conda install pyqt5;
Copy link
Member

Choose a reason for hiding this comment

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

@ccordoba12 is not it better, cleaner and safer to do it like this?

if [ "$USE_QT_API" = "PyQt5" ]; then
    conda install pyqt=5.* qt=5.* -c  qttesting;
elif [ "$USE_QT_API" = "PyQt4" ]; then
    conda install pyqt=4.* qt=4.*;
fi

Copy link
Member

Choose a reason for hiding this comment

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

Agreed. @mingwandroid, could you do these changes, please?

Copy link
Member

Choose a reason for hiding this comment

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

I'll do these changes in PR #3338 by @mingwandroid suggestion.

@@ -1399,3 +1399,5 @@ Since version 2.1:
* Editor/80-column vertical edge line: added options to show/hide this line and change the column number
* Editor: added "Comment"/"Uncomment" actions to context menu
* Source code and shell editor widgets: code refactoring/cleaning (this should help people using these widgets outside Spyder)

Another bump
Copy link
Member

Choose a reason for hiding this comment

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

Please remove this line. @mingwandroid, you can close/reopen a PR to trigger a new build in Travis and Appveyor, instead of creating these fake commits :-)

@ccordoba12
Copy link
Member

Closing in favor in #3338.

@ccordoba12 ccordoba12 closed this Aug 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants