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

Treat Exif.Sony1.PreviewImage as undefined tag (backport #2015) #2016

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2021

This is an automatic backport of pull request #2015 done by Mergify.
Cherry-pick of a1ad29e has failed:

On branch mergify/bp/0.27-maintenance/pr-2015
Your branch is up to date with 'origin/0.27-maintenance'.

You are currently cherry-picking commit a1ad29ed.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tests/bugfixes/github/test_issue_1881.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/tiffvisitor_int.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@kevinbackhouse
Copy link
Collaborator

Looks like Conan is acting up again. 😡

@clanmills
Copy link
Collaborator

I had trouble with conan on Saturday: #2012.

For the MinGW and Cygwin CI, I don't use conan to build. I install the dependencies with the package manager, get cmake to generate Makefile and build with make. That strategy doesn't scale well for Linux because different distros use different package managers. The weak link with conan seems to be getting the recipe from the remote server. It should be:

501 rmills@rmillsmm-local:~ $ conan remote list
conan-center: https://center.conan.io [Verify SSL: True]
502 rmills@rmillsmm-local:~ $ 

I only use conan to build the dependencies for Visual Studio. It works well. I encountered the "certificate out of date" on Saturday, changed conan-center, installed the latest conan and deleted the cache. Then it worked.

@piponazo piponazo force-pushed the mergify/bp/0.27-maintenance/pr-2015 branch from 51dab4a to 5adae7e Compare December 10, 2021 17:15
@piponazo
Copy link
Collaborator

I took the freedom to rebase the branch. After the changes done in the last days about conan, the situation should be solved.

@piponazo piponazo self-requested a review December 10, 2021 17:31
@codecov
Copy link

codecov bot commented Dec 10, 2021

Codecov Report

Merging #2016 (5adae7e) into 0.27-maintenance (2cbdfac) will increase coverage by 0.00%.
The diff coverage is 66.66%.

Impacted file tree graph

@@                Coverage Diff                @@
##           0.27-maintenance    #2016   +/-   ##
=================================================
  Coverage             46.36%   46.37%           
=================================================
  Files                   146      146           
  Lines                 23005    22999    -6     
  Branches              11809    11806    -3     
=================================================
- Hits                  10666    10665    -1     
+ Misses                 6689     6688    -1     
+ Partials               5650     5646    -4     
Impacted Files Coverage Δ
src/tiffvisitor_int.cpp 54.54% <66.66%> (-0.09%) ⬇️
src/jpgimage.cpp 50.82% <0.00%> (+0.41%) ⬆️

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 2cbdfac...5adae7e. Read the comment docs.

@kevinbackhouse kevinbackhouse merged commit e9646e3 into 0.27-maintenance Dec 14, 2021
@kevinbackhouse kevinbackhouse deleted the mergify/bp/0.27-maintenance/pr-2015 branch December 14, 2021 11:44
@kevinbackhouse kevinbackhouse added this to the v0.27.6 milestone May 1, 2022
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