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.

Sign up for GitHub

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

Jump to bottom

Merge #3191, #3196 and #3209 #3217

Merged
merged 89 commits into from
Nov 14, 2018
Merged

Merge #3191, #3196 and #3209 #3217

merged 89 commits into from
Nov 14, 2018

Conversation

techalchemy
Copy link
Member

@techalchemy techalchemy commented Nov 13, 2018 •
edited by frostming
Loading

devxpy and others added 30 commits October 27, 2018 23:55
@devxpy
add PIPENV_SKIP_LOCK envvar, and suitable doc
80a6dcb
@devxpy
fix PIPENV_SKIP_LOCK for pipenv unisntall command.
023e786
@devxpy
Merge branch 'master' into master
09ba364
@devxpy
Merge branch 'master' into master
e2769fe
@devxpy
Merge branch 'master' into master
9ed610f
@devxpy
Merge branch 'master' into master
18be92b
@devxpy
fix errors from merge
2b195dd
@frostming
Improve toml parsing
3eba19d
@frostming
Drops prettytoml/contoml form vendors
e147dc3
@frostming
clear references in patched.txt
b27d6a7
@frostming
Add back some tests
1555200
@frostming
python 2.7 unicode
53b073c
@frostming
make tomlkit dump toml's inline table
b3aa66b
@techalchemy
Merge branch 'master' into improve-toml-parse
9743d98
@techalchemy
Grab updates from latest vendored changes
36f054d 
Signed-off-by: Dan Ryan <[email protected]>
@frostming
Force inline table
65d7090
@techalchemy
Fix broken requirementslib updates
5b49670 
Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Merge branch 'master' into update-vendor
f3003b6
@frostming
Final fix
0762528
@frostming
fix patch
3490fc8
@frostming
Only convert outline tables when write toml
de78c1e
@frostming
Move to utils function
accd0ea
@frostming
update tomlkit
6df7d88
@frostming
update patch
1f7c9ef
@frostming
backports import
de98b87
@frostming
Change fallback style
f5c7c58
@techalchemy
Revendor requirementslib
2b90c89 
- Implement improvements and bugfixes in codebase
- Remote archives will now resolve properly

Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Introduce pipenv.environments.Environment
dec7be5 
- Specific construct for isolationg operations

Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Update vistir and requirementslib
642b6f9 
Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Fix stdout and stderr wrappers
aedb41c 
Signed-off-by: Dan Ryan <[email protected]>
@techalchemy techalchemy added Type: Enhancement 💡 This is a feature or enhancement request. Category: Performance Issue relates to performance Type: Vendored Dependencies This issue affects vendored dependencies within pipenv. labels Nov 13, 2018
@techalchemy techalchemy mentioned this pull request Nov 13, 2018
Closed
@frostming
Copy link
Contributor

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 9 commits November 14, 2018 13:15
@frostming
remove useless tests
095c9ef
@techalchemy
Implement auto_envvar_prefix
08c384b 
- Closes #2200

Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Update vendor file
2f97279 
Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Merge branch 'maintenance/merge-3191-3196-3209' of github.com:pypa/pi…
3585ef1 
…penv into maintenance/merge-3191-3196-3209
@techalchemy
Reformat cli and command code
ec166f9 
Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Merge remote-tracking branch 'devxpy/master' into maintenance/merge-3…
e864343 
…191-3196-3209

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

Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Woops, delegator isn't updated, neither packaging
86c894d 
Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Remove old patch
ada66d3 
Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Update vendored deps
bfa0b29 
Signed-off-by: Dan Ryan <[email protected]>
@techalchemy
Copy link
Member Author

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

@techalchemy
Copy link
Member Author

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

@frostming frostming mentioned this pull request Nov 14, 2018
Closed
@techalchemy techalchemy merged commit d9ebad3 into master Nov 14, 2018
@techalchemy techalchemy deleted the maintenance/merge-3191-3196-3209 branch November 14, 2018 23:13
@clintonb clintonb mentioned this pull request Nov 21, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Category: Performance Issue relates to performance Type: Enhancement 💡 This is a feature or enhancement request. Type: Vendored Dependencies This issue affects vendored dependencies within pipenv.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@techalchemy @frostming @devxpy