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

Fix CI #2348

Merged
merged 3 commits into from Apr 3, 2020
Merged

Fix CI #2348

merged 3 commits into from Apr 3, 2020

Conversation

ericpre
Copy link
Member

@ericpre ericpre commented Apr 2, 2020

The png issue should be fixed in pillow 7.1.1 (python-pillow/Pillow#4512, python-pillow/Pillow#4515)

…encies since it is not available on pip and it breaks the pip installation. The motivation was to avoid installing qt with conda but it only saves a few seconds of CI and it is not worth it.
@ericpre
Copy link
Member Author

ericpre commented Apr 2, 2020

The travis results does not show in the "check list" at the moment. According to this issue (https://travis-ci.community/t/travis-ci-build-no-longer-showing-as-check-on-github-pull-request-page/6955/5), it may be necessary to reset grant access to Travis CI to fix it. I have just did for my account and it worked.

@codecov
Copy link

codecov bot commented Apr 2, 2020

Codecov Report

Merging #2348 into RELEASE_next_patch will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           RELEASE_next_patch    #2348   +/-   ##
===================================================
  Coverage               71.65%   71.66%           
===================================================
  Files                     177      177           
  Lines                   20947    20947           
  Branches                 4444     4444           
===================================================
+ Hits                    15010    15011    +1     
+ Misses                   4627     4626    -1     
  Partials                 1310     1310           
Impacted Files Coverage Δ
hyperspy/samfire_utils/samfire_worker.py 66.82% <0.00%> (+0.46%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 77fd3a0...a6ed8ac. Read the comment docs.

.travis.yml Outdated
@@ -51,6 +51,9 @@ install:
- if [[ $MINIMAL_ENV == false ]] ; then
DEPS="${DEPS} ${DEPS_OPTIONAL}";
fi
- if [[ $ENV == pip ]] ; then
Copy link
Member

Choose a reason for hiding this comment

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

Could you add some comments here explaining why this is needed?

Copy link
Member Author

Choose a reason for hiding this comment

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

This was to check that the pillow version was the issue. pillow 7.1.1 have been released a few hours ago, once it is available on pypi, I will remove this.

@francisco-dlp francisco-dlp merged commit bca47e2 into hyperspy:RELEASE_next_patch Apr 3, 2020
@ericpre ericpre deleted the fix_travis_RNP branch April 3, 2020 11:40
@francisco-dlp francisco-dlp added this to the v1.6 milestone May 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants