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

Migrate to python3.10 and apply patches. #58

Merged
merged 7 commits into from
Dec 6, 2021

Conversation

erykoff
Copy link
Contributor

@erykoff erykoff commented Dec 5, 2021

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

This applies the proposed upstream patches from docker/docker-py#2857

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@@ -7,9 +7,12 @@ package:
source:
url: https://github.com/docker/docker-py/archive/{{ version }}.tar.gz
sha256: 0035772df94a86e8db02aac363393755584383aacf50d37b0d55ea817149e1f4
patches:
- 0001-loosen-pywin32-pin.patch
- 0002-update-test-skips.patch
Copy link
Member

Choose a reason for hiding this comment

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

Are these upstream or upstream-able? If the former please add a link to the commit or PR that added them. If the latter than consider sending them upstream.

@@ -1,3 +1,4 @@
Adapted from https://github.com/docker/docker-py/pull/2857/commits/2e8975698eb3bc36cb037e601ee798eace9bcc53
Copy link
Member

Choose a reason for hiding this comment

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

Please add those to the recipe as a comment at the top of the patch line. Here they'll probably break the patching.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great point, I've moved the references. But it turns out you can put anything you want at the top of a patch file, I believe it's ignored until it hits the --- line.

Copy link
Member

Choose a reason for hiding this comment

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

Ah. Yes! Still, we need to easily spot those during the next update to decide if we can drop them or not. So the best place is the recipe. Addition comments like, umerged, or merged and can be dropped next release also helps.

@ocefpaf ocefpaf merged commit 26dc0ec into conda-forge:master Dec 6, 2021
@erykoff erykoff mentioned this pull request Dec 7, 2021
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.

None yet

3 participants