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

Fixed editable package with markers can not be locked #2903

Merged

Conversation

jxltom
Copy link
Contributor

@jxltom jxltom commented Sep 30, 2018

The issue

Fixed #2902 and also added tests. Without this patch, the new added test will fail.

The fix

Fixed in upstream sarugaku/requirementslib#71. If it can be accepted in upstream, then it can be merged here.

The checklist
  • Associated issue
  • A news fragment in the news/ directory to describe this fix with the extension .bugfix, .feature, .behavior, .doc. .vendor. or .trivial (this will appear in the release changelog). Use semantic line breaks and name the file after the issue number or the PR #.

@uranusjr
Copy link
Member

uranusjr commented Oct 3, 2018

I think this can be closed? We upgrade vendor packages before release. The fix in RequirementsLib will be included by the automated script, so you don’t need to do this manually.

@jxltom
Copy link
Contributor Author

jxltom commented Oct 3, 2018

No problem.

But how about the added tests? It will be nice to have tests which can make sure that later development won't break any current working cases

@uranusjr
Copy link
Member

uranusjr commented Oct 3, 2018

I’d be fine if there is a test to ensure pipenv lock -r works, so I’ll merge if you take out the requirementslib patch (and probably change the news fragment). We’ll need to do it later though, otherwise it’ll break all CI.

@jxltom jxltom force-pushed the fixed-editable-package-with-marker-cannot-lock branch from fb21bb1 to 6207fec Compare October 4, 2018 02:29
@jxltom
Copy link
Contributor Author

jxltom commented Oct 4, 2018

Great.

I've udpated the PR which removed the requirementslib patch as well as the news (since the test is too trivial)

Currently the CI would be broken but it should be fine after sarugaku/requirementslib#71 is merged from upstream.

@uranusjr uranusjr added the PR: awaiting-merge The PR related to this issue has been reviewed and is awaiting merge. label Oct 4, 2018
@techalchemy
Copy link
Member

I’ll release requirementslib in the next few days when I am sure we captured everything

@jxltom jxltom force-pushed the fixed-editable-package-with-marker-cannot-lock branch from 6207fec to 6525e31 Compare October 8, 2018 05:21
@jxltom
Copy link
Contributor Author

jxltom commented Oct 9, 2018

Update: it's ready for merge since #2935 has been merged

@techalchemy techalchemy merged commit fe35c98 into pypa:master Oct 12, 2018
@jxltom jxltom deleted the fixed-editable-package-with-marker-cannot-lock branch October 12, 2018 23:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: awaiting-merge The PR related to this issue has been reviewed and is awaiting merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Editable packages with markers can not be locked
3 participants