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

Merge #3191, #3196 and #3209 #3217

Merged
merged 89 commits into from Nov 14, 2018

Conversation

Projects
None yet
3 participants
@techalchemy
Member

techalchemy commented Nov 13, 2018

Let's make sure these merge cleanly

devxpy and others added some commits Oct 27, 2018

Grab updates from latest vendored changes
Signed-off-by: Dan Ryan <dan@danryan.co>
Fix broken requirementslib updates
Signed-off-by: Dan Ryan <dan@danryan.co>
Revendor requirementslib
- Implement improvements and bugfixes in codebase
- Remote archives will now resolve properly

Signed-off-by: Dan Ryan <dan@danryan.co>
Introduce `pipenv.environments.Environment`
- Specific construct for isolationg operations

Signed-off-by: Dan Ryan <dan@danryan.co>
Update vistir and requirementslib
Signed-off-by: Dan Ryan <dan@danryan.co>
Fix stdout and stderr wrappers
Signed-off-by: Dan Ryan <dan@danryan.co>

techalchemy added some commits Nov 13, 2018

Derive source names from URLs when not supplied
- Fixes #3216

Signed-off-by: Dan Ryan <dan@danryan.co>
Update news entries
Signed-off-by: Dan Ryan <dan@danryan.co>
Syntax error and pythonfinder issue fixes
Signed-off-by: Dan Ryan <dan@danryan.co>
Code cleanup -- unused functions
Signed-off-by: Dan Ryan <dan@danryan.co>
Fix pythonfinder
Signed-off-by: Dan Ryan <dan@danryan.co>
Get rid of split file test
Signed-off-by: Dan Ryan <dan@danryan.co>
@frostming

This comment has been minimized.

Collaborator

frostming commented Nov 14, 2018

Good job Dan, we are getting close now 🎉

>       split_dict = pipenv.utils.split_file(pipfile_dict)
E       AttributeError: 'module' object has no attribute 'split_file'

frostming and others added some commits Nov 14, 2018

Implement `auto_envvar_prefix`
- Closes #2200

Signed-off-by: Dan Ryan <dan@danryan.co>
Update vendor file
Signed-off-by: Dan Ryan <dan@danryan.co>
Merge branch 'maintenance/merge-3191-3196-3209' of github.com:pypa/pi…
…penv into maintenance/merge-3191-3196-3209
Reformat cli and command code
Signed-off-by: Dan Ryan <dan@danryan.co>
Merge remote-tracking branch 'devxpy/master' into maintenance/merge-3…
…191-3196-3209

- Closes #2200
- Closes #3112 (via merge)

Signed-off-by: Dan Ryan <dan@danryan.co>
Woops, delegator isn't updated, neither packaging
Signed-off-by: Dan Ryan <dan@danryan.co>
Remove old patch
Signed-off-by: Dan Ryan <dan@danryan.co>
Update vendored deps
Signed-off-by: Dan Ryan <dan@danryan.co>
@techalchemy

This comment has been minimized.

Member

techalchemy commented Nov 14, 2018

Literally no idea why the new thing is failing....

@techalchemy

This comment has been minimized.

Member

techalchemy commented Nov 14, 2018

Hmm maybe I left those in version control on the other packages. Otherwise everything passed so I’m cutting a release in a few mins

techalchemy added some commits Nov 14, 2018

Stray print
Signed-off-by: Dan Ryan <dan@danryan.co>
Update core and rebuild ci
Signed-off-by: Dan Ryan <dan@danryan.co>
accidental commit
Signed-off-by: Dan Ryan <dan@danryan.co>
Pin postreleases to pass packaging ci
Signed-off-by: Dan Ryan <dan@danryan.co>

@techalchemy techalchemy merged commit d9ebad3 into master Nov 14, 2018

2 checks passed

pipenv CI (Linux) #Pipenv Build Rules succeeded
Details
pipenv CI (Windows) #Pipenv Build Rules succeeded
Details

@techalchemy techalchemy deleted the maintenance/merge-3191-3196-3209 branch Nov 14, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment