e207cae32b
Merge branch 'master' into licenses
2018-04-12 22:55:18 -04:00
674a2c7106
Merge pull request #1971 from pypa/fix-python-version-parsing
...
Fix Python version parsing
2018-04-12 22:54:57 -04:00
6c52ee088e
Merge branch 'fix-python-version-parsing' of github.com:pypa/pipenv into fix-python-version-parsing
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-04-12 19:59:05 -04:00
cf3c561100
Pass environment to subprocess
...
- `check_output` needs to pass `PYTHONIOENCODING` to `Popen` on python2
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-04-12 19:41:01 -04:00
2f4c0e92a8
Merge branch 'master' into licenses
2018-04-12 19:19:34 -04:00
31b6f1ba7a
Merge branch 'master' into fix-python-version-parsing
2018-04-12 18:50:38 -04:00
b792618f2d
Merge pull request #1976 from greysteil/no-outdated-version
...
Check whether dependency exists in old lockfile during keep-updated lock
2018-04-12 18:49:39 -04:00
0c334b304c
Merge branch 'master' into no-outdated-version
2018-04-12 18:49:18 -04:00
3fa64125c2
Fix create_pipfile version parsing
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-04-12 18:43:05 -04:00
8c3fa7f19a
Mention 3rd party LICENSEs in NOTICES
2018-04-12 21:22:32 +02:00
7afbcaec96
Add a note about updating LICENSE files to vendor/patched READMEs
2018-04-12 20:47:04 +02:00
02e67a324f
Include LICENSE files in sdist
2018-04-12 20:47:04 +02:00
f47f574823
Add LICENSE files from vendors
...
appdirs: MIT from https://github.com/ActiveState/appdirs/blob/master/LICENSE.txt
backports: Python from https://github.com/python/cpython/blob/master/LICENSE
click: BSD from https://github.com/pallets/click/blob/master/LICENSE
click_completion: MIT from https://github.com/click-contrib/click-completion/blob/master/LICENSE
click_didyoumean: MIT from https://github.com/click-contrib/click-didyoumean/blob/master/LICENSE
colorama: BSD from https://github.com/tartley/colorama/blob/master/LICENSE.txt
docopt: MIT from https://github.com/docopt/docopt/blob/master/LICENSE-MIT
dotenv: BSD from https://github.com/theskumar/python-dotenv/blob/master/LICENSE
first: MIT from https://github.com/hynek/first/blob/master/LICENSE
iso8601: MIT from https://bitbucket.org/micktwomey/pyiso8601/src/default/LICENSE
jinja2: BSD from https://github.com/pallets/jinja/blob/master/LICENSE and AUTHORS
markupsafe: BSD from https://github.com/pallets/markupsafe/blob/master/LICENSE and AUTHORS
pathlib2: MIT from https://github.com/mcmtroffaes/pathlib2/blob/develop/LICENSE.rst
pexpect: ISC from https://github.com/pexpect/pexpect/blob/master/LICENSE
pip9: MIT from https://github.com/pypa/pip/blob/master/LICENSE.txt
(bundles internally a lot, I haven't yet addressed that)
pipdeptree: MIT from https://github.com/naiquevin/pipdeptree/blob/master/LICENSE
pipreqs: Apache from https://github.com/bndr/pipreqs/blob/master/LICENSE
ptyprocess: ISC from https://github.com/pexpect/ptyprocess/blob/master/LICENSE
pytoml: No-notice MIT License from https://github.com/avakar/pytoml/blob/master/LICENSE
(doesn't technically need to be added, yet I added it)
requests: Apache notice from https://github.com/requests/requests/blob/master/LICENSE
(bundles chardet and urllib3 internally, I haven't yet addressed that)
semver: MIT from https://github.com/k-bx/python-semver/blob/master/LICENSE.txt
shutilwhich: Python from https://github.com/mbr/shutilwhich/blob/master/LICENSE
six: MIT from https://github.com/benjaminp/six/blob/master/LICENSE
toml: MIT from https://github.com/uiri/toml/blob/0.9.2/LICENSE
yarg: MIT from https://github.com/kura/yarg/blob/master/LICENSE
Soem vendor licenses are still missing, see https://github.com/pypa/pipenv/issues/1961#issuecomment-380905132
2018-04-12 20:47:04 +02:00
58cf67baa0
Add licenses for patched 3rd party libraries
...
contoml: MIT from https://github.com/jumpscale7/python-consistent-toml/blob/master/LICENSE
crayons: has the same copyright note and license as pipenv, so it's fine without
notpip: MIT from https://github.com/pypa/pip/blob/master/LICENSE.txt
(bundles internally a lot, I haven't yet addressed that)
pew: MIT from https://github.com/berdario/pew/blob/master/LICENSE
no copyright notice, filled https://github.com/berdario/pew/issues/190
pipfile: BSD+Apache from:
https://github.com/pypa/pipfile/blob/master/LICENSE
https://github.com/pypa/pipfile/blob/master/LICENSE.APACHE
https://github.com/pypa/pipfile/blob/master/LICENSE.BSD
piptools: BSD from https://github.com/jazzband/pip-tools/blob/master/LICENSE
prettytoml: MIT from https://pypi.python.org/pypi/prettytoml/0.3 sdist
safety: MIT already included in zip as LICENSE
See https://github.com/pypa/pipenv/issues/1961
2018-04-12 20:47:04 +02:00
5458817b8b
Merge branch 'master' into fix-python-version-parsing
2018-04-12 14:32:59 -04:00
495ba0f94e
Check whether dependency exists in old lockfile during keep-updated lock
2018-04-12 18:33:13 +01:00
eeecdf71f5
Merge pull request #1958 from frostming/doc-scripts
...
Mention scripts section in doc
2018-04-12 12:20:19 -04:00
9bb2c4c106
Merge branch 'master' into doc-scripts
2018-04-12 12:20:06 -04:00
5b2db86fa9
Add a trivial test for help
2018-04-13 00:10:45 +08:00
4a15f3b1c1
Make sure --version succeeds
...
And make sure what it returns makes sense. In case it isn't, return None.
2018-04-13 00:04:04 +08:00
6a8d8c41f6
Merge pull request #1960 from pypa/split-tests
...
Split tests
2018-04-12 20:52:25 +08:00
e428f857d2
Better finalize mock
2018-04-12 18:14:31 +08:00
d8b1d637e0
Missed path fix
2018-04-12 18:11:59 +08:00
9d83f6d8e0
Fix Windows test marker
2018-04-12 18:06:46 +08:00
60a48c0436
Inject environs in another way
2018-04-12 18:03:36 +08:00
fabaa4955f
Mock finalize
2018-04-12 18:01:43 +08:00
f730dd4899
Fix relative paths in tests
2018-04-12 17:48:53 +08:00
cde60ca58c
Fix import
2018-04-12 17:47:54 +08:00
4533e68bca
Move things around
2018-04-12 17:35:17 +08:00
1dea2a27b2
Project cannot be a fixture
2018-04-12 17:34:03 +08:00
92cc570588
Split up tests in test_pipenv
...
All tests are intact. I only move them around.
PipenvInstance is turned into a fixture to be used across files.
needs_internet is turned into a marker to be used across files.
2018-04-12 17:05:17 +08:00
0e8e7ef0c4
Split up tests in test_utils
2018-04-12 15:01:12 +08:00
92f3789abb
Mention scripts section in doc
2018-04-12 10:51:28 +08:00
eddc72ac13
Update history and bump version to 11.10.0
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-04-11 17:06:56 -04:00
6fe401f7b8
Merge pull request #1896 from jtratner/hash-cache
...
Hash cache
2018-04-11 15:38:59 -04:00
918b276f03
Merge branch 'master' into hash-cache
2018-04-11 14:38:26 -04:00
bda171000e
Merge pull request #1946 from pypa/bugfix/windows-venv-name
...
Windows VEnv Case normalization
2018-04-11 14:38:09 -04:00
337302b165
Merge branch 'master' into bugfix/windows-venv-name
2018-04-11 13:52:39 -04:00
217b43bdd8
Merge pull request #1944 from pypa/bugfix/1937-resolve-wheels
...
Resolve dependencies of local wheels
2018-04-11 13:47:58 -04:00
3f8f306caf
Do encode/decode stuff
2018-04-11 09:39:27 -07:00
cb895aa94e
Cache hashes locally for greater speed
2018-04-11 09:39:27 -07:00
dbbf10b94c
Merge branch 'master' into bugfix/1937-resolve-wheels
2018-04-11 12:19:54 -04:00
a895218013
Resolve Pipfile location for hash caculation
...
This should prevent the lookup loop most of the time, especially for new
virtualenvs created from now on.
2018-04-12 00:15:16 +08:00
d2b0580427
Merge pull request #1902 from vlcinsky/man_tox
...
Man page section about `tox.ini` updated
2018-04-11 00:18:12 -04:00
36b14998c0
Merge branch 'master' into man_tox
2018-04-11 00:16:39 -04:00
44d994fd2e
Update pipenv.1
2018-04-11 00:16:18 -04:00
8d078f8a0b
Update advanced.rst
2018-04-11 00:14:05 -04:00
a60077862c
Update advanced.rst
2018-04-11 00:12:58 -04:00
3b1330993a
Merge pull request #1936 from pypa/test-fixes
...
Test speedups
2018-04-11 00:10:59 -04:00
219d20faca
Merge branch 'test-fixes' of github.com:pypa/pipenv into test-fixes
2018-04-10 23:38:25 -04:00
Dan Ryan