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

Merge #3191, #3196 and #3209 #3217

Merged
merged 89 commits into from
Nov 14, 2018
Merged
Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
80a6dcb
add PIPENV_SKIP_LOCK envvar, and suitable doc
devxpy Oct 27, 2018
023e786
fix PIPENV_SKIP_LOCK for `pipenv unisntall` command.
devxpy Oct 27, 2018
09ba364
Merge branch 'master' into master
devxpy Oct 30, 2018
e2769fe
Merge branch 'master' into master
devxpy Oct 30, 2018
9ed610f
Merge branch 'master' into master
devxpy Nov 3, 2018
18be92b
Merge branch 'master' into master
devxpy Nov 7, 2018
2b195dd
fix errors from merge
devxpy Nov 8, 2018
3eba19d
Improve toml parsing
frostming Nov 8, 2018
e147dc3
Drops prettytoml/contoml form vendors
frostming Nov 8, 2018
b27d6a7
clear references in patched.txt
frostming Nov 8, 2018
1555200
Add back some tests
frostming Nov 8, 2018
53b073c
python 2.7 unicode
frostming Nov 8, 2018
b3aa66b
make tomlkit dump toml's inline table
frostming Nov 8, 2018
9743d98
Merge branch 'master' into improve-toml-parse
techalchemy Nov 8, 2018
36f054d
Grab updates from latest vendored changes
techalchemy Nov 8, 2018
65d7090
Force inline table
frostming Nov 8, 2018
5b49670
Fix broken requirementslib updates
techalchemy Nov 8, 2018
f3003b6
Merge branch 'master' into update-vendor
techalchemy Nov 8, 2018
0762528
Final fix
frostming Nov 9, 2018
3490fc8
fix patch
frostming Nov 9, 2018
de78c1e
Only convert outline tables when write toml
frostming Nov 9, 2018
accd0ea
Move to utils function
frostming Nov 9, 2018
6df7d88
update tomlkit
frostming Nov 10, 2018
1f7c9ef
update patch
frostming Nov 10, 2018
de98b87
backports import
frostming Nov 10, 2018
f5c7c58
Change fallback style
frostming Nov 10, 2018
2b90c89
Revendor requirementslib
techalchemy Nov 11, 2018
dec7be5
Introduce `pipenv.environments.Environment`
techalchemy Nov 11, 2018
642b6f9
Update vistir and requirementslib
techalchemy Nov 11, 2018
aedb41c
Fix stdout and stderr wrappers
techalchemy Nov 11, 2018
45100b8
Fix stdout and stderr wrappers
techalchemy Nov 11, 2018
118c9d3
Add dramatically improved queued installation
techalchemy Nov 11, 2018
5602952
Merge branch 'update-vendor' of github.com:pypa/pipenv into update-ve…
techalchemy Nov 11, 2018
690d1e8
Merge branch 'update-vendor' into feature/improved-async-installer
techalchemy Nov 11, 2018
8644611
Merge branch 'master' into update-vendor
techalchemy Nov 11, 2018
ac96370
Merge branch 'update-vendor' into feature/improved-async-installer
techalchemy Nov 11, 2018
8643a73
Fix configparser import
techalchemy Nov 11, 2018
0caf7a0
Fix configparser import
techalchemy Nov 11, 2018
650cc32
Fix resource errors
techalchemy Nov 11, 2018
fe9d996
Fix resource errors
techalchemy Nov 11, 2018
e5be2ac
Fix python 2.7 installations
techalchemy Nov 12, 2018
382be38
Fix python 2.7 installations
techalchemy Nov 12, 2018
489e534
Fix various bugs with python 2.7 and vendored deps
techalchemy Nov 12, 2018
3984632
Fix various bugs with python 2.7 and vendored deps
techalchemy Nov 12, 2018
32a6dd3
Support python 2 parsing
techalchemy Nov 12, 2018
4009198
Fix environment site import
techalchemy Nov 12, 2018
32b1113
Support python 2 parsing
techalchemy Nov 12, 2018
1216ae0
Fix environment site import
techalchemy Nov 12, 2018
70fc92b
Fix import errors on setup parsing
techalchemy Nov 12, 2018
7e139ad
Fix import errors on setup parsing
techalchemy Nov 12, 2018
8502ac9
Revendor
techalchemy Nov 12, 2018
013e3d0
Revendor
techalchemy Nov 12, 2018
96cbd58
Fix prefix comparison for py2
techalchemy Nov 12, 2018
8fa4057
Merge branch 'master' into update-vendor
techalchemy Nov 12, 2018
0c7f287
Fix prefix comparison for py2
techalchemy Nov 12, 2018
eed0f0f
Merge branch 'master' into feature/improved-async-installer
techalchemy Nov 12, 2018
d7d50ef
no samefile for windows python2.7
techalchemy Nov 12, 2018
9eabde0
no samefile for windows python2.7
techalchemy Nov 12, 2018
ef59d15
Fix bugs in environment implementation
techalchemy Nov 13, 2018
9296f56
Fix bugs in environment implementation
techalchemy Nov 13, 2018
e62b800
Fix syntax
techalchemy Nov 13, 2018
cb601b0
Fix syntax
techalchemy Nov 13, 2018
13c9e62
Update pythonfinder
techalchemy Nov 13, 2018
7bc754a
Merge branch 'master' into update-vendor
techalchemy Nov 13, 2018
d73879b
Update requirementslib
techalchemy Nov 13, 2018
e328ae2
Fix feedback
techalchemy Nov 13, 2018
310e0b2
Fix pythonfinder
techalchemy Nov 13, 2018
6b3c9a7
Remove accidentally committed test script
techalchemy Nov 13, 2018
4370281
Merge branch 'update-vendor' into feature/improved-async-installer
techalchemy Nov 13, 2018
c3cdbfb
Merge remote-tracking branch 'frostming/improve-toml-parse' into main…
techalchemy Nov 13, 2018
72e2ef7
Derive source names from URLs when not supplied
techalchemy Nov 13, 2018
1e3b8f9
Update news entries
techalchemy Nov 13, 2018
15f8d78
Syntax error and pythonfinder issue fixes
techalchemy Nov 13, 2018
f494571
Code cleanup -- unused functions
techalchemy Nov 13, 2018
2e10ff6
Fix pythonfinder
techalchemy Nov 13, 2018
f9b97da
Get rid of split file test
techalchemy Nov 14, 2018
095c9ef
remove useless tests
frostming Nov 14, 2018
08c384b
Implement `auto_envvar_prefix`
techalchemy Nov 14, 2018
2f97279
Update vendor file
techalchemy Nov 14, 2018
3585ef1
Merge branch 'maintenance/merge-3191-3196-3209' of github.com:pypa/pi…
techalchemy Nov 14, 2018
ec166f9
Reformat cli and command code
techalchemy Nov 14, 2018
e864343
Merge remote-tracking branch 'devxpy/master' into maintenance/merge-3…
techalchemy Nov 14, 2018
86c894d
Woops, delegator isn't updated, neither packaging
techalchemy Nov 14, 2018
ada66d3
Remove old patch
techalchemy Nov 14, 2018
bfa0b29
Update vendored deps
techalchemy Nov 14, 2018
5e5e1ed
Stray print
techalchemy Nov 14, 2018
08d94d4
Update core and rebuild ci
techalchemy Nov 14, 2018
a8f4c7e
accidental commit
techalchemy Nov 14, 2018
41cbe4d
Pin postreleases to pass packaging ci
techalchemy Nov 14, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Support python 2 parsing
Signed-off-by: Dan Ryan <dan@danryan.co>
  • Loading branch information
techalchemy committed Nov 12, 2018
commit 32a6dd38a56e40b408317dc922b0e9f703b9be71
11 changes: 7 additions & 4 deletions pipenv/vendor/requirementslib/models/setup_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,19 +221,22 @@ def parse_setup_cfg(self):
def run_setup(self):
if self.setup_py is not None and self.setup_py.exists():
with cd(self.setup_py.parent), _suppress_distutils_logs():
from setuptools.dist import distutils
save_argv = sys.argv.copy()
try:
if sys.version_info < (3, 5):
save_argv = sys.argv[:]
else:
save_argv = sys.argv.copy()
# This is for you, Hynek
# see https://github.com/hynek/environ_config/blob/69b1c8a/setup.py
try:
global _setup_distribution, _setup_stop_after
_setup_stop_after = "run"
script_name = self.setup_py.as_posix()
g = {"__file__": script_name, "__name__": "__main__"}
l = {}
sys.argv[0] = script_name
sys.argv[1:] = ["egg_info", "--egg-base", self.base_dir]
with open(script_name, 'rb') as f:
exec(f.read(), g)
exec(f.read(), g, l)
finally:
_setup_stop_after = None
sys.argv = save_argv
Expand Down