Commit Graph

3882 Commits

Author SHA1 Message Date
Dan Ryan 5458817b8b Merge branch 'master' into fix-python-version-parsing 2018-04-12 14:32:59 -04:00
Dan Ryan eeecdf71f5 Merge pull request #1958 from frostming/doc-scripts
Mention scripts section in doc
2018-04-12 12:20:19 -04:00
Dan Ryan 9bb2c4c106 Merge branch 'master' into doc-scripts 2018-04-12 12:20:06 -04:00
Tzu-ping Chung 5b2db86fa9 Add a trivial test for help 2018-04-13 00:10:45 +08:00
Tzu-ping Chung 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
Tzu-ping Chung 6a8d8c41f6 Merge pull request #1960 from pypa/split-tests
Split tests
2018-04-12 20:52:25 +08:00
Tzu-ping Chung e428f857d2 Better finalize mock 2018-04-12 18:14:31 +08:00
Tzu-ping Chung d8b1d637e0 Missed path fix 2018-04-12 18:11:59 +08:00
Tzu-ping Chung 9d83f6d8e0 Fix Windows test marker 2018-04-12 18:06:46 +08:00
Tzu-ping Chung 60a48c0436 Inject environs in another way 2018-04-12 18:03:36 +08:00
Tzu-ping Chung fabaa4955f Mock finalize 2018-04-12 18:01:43 +08:00
Tzu-ping Chung f730dd4899 Fix relative paths in tests 2018-04-12 17:48:53 +08:00
Tzu-ping Chung cde60ca58c Fix import 2018-04-12 17:47:54 +08:00
Tzu-ping Chung 4533e68bca Move things around 2018-04-12 17:35:17 +08:00
Tzu-ping Chung 1dea2a27b2 Project cannot be a fixture 2018-04-12 17:34:03 +08:00
Tzu-ping Chung 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
Tzu-ping Chung 0e8e7ef0c4 Split up tests in test_utils 2018-04-12 15:01:12 +08:00
frostming 92f3789abb Mention scripts section in doc 2018-04-12 10:51:28 +08:00
Dan Ryan eddc72ac13 Update history and bump version to 11.10.0
Signed-off-by: Dan Ryan <dan@danryan.co>
v11.10.0
2018-04-11 17:06:56 -04:00
Dan Ryan 6fe401f7b8 Merge pull request #1896 from jtratner/hash-cache
Hash cache
2018-04-11 15:38:59 -04:00
Dan Ryan 918b276f03 Merge branch 'master' into hash-cache 2018-04-11 14:38:26 -04:00
Dan Ryan bda171000e Merge pull request #1946 from pypa/bugfix/windows-venv-name
Windows VEnv Case normalization
2018-04-11 14:38:09 -04:00
Dan Ryan 337302b165 Merge branch 'master' into bugfix/windows-venv-name 2018-04-11 13:52:39 -04:00
Dan Ryan 217b43bdd8 Merge pull request #1944 from pypa/bugfix/1937-resolve-wheels
Resolve dependencies of local wheels
2018-04-11 13:47:58 -04:00
Jeff Tratner 3f8f306caf Do encode/decode stuff 2018-04-11 09:39:27 -07:00
Jeff Tratner cb895aa94e Cache hashes locally for greater speed 2018-04-11 09:39:27 -07:00
Dan Ryan dbbf10b94c Merge branch 'master' into bugfix/1937-resolve-wheels 2018-04-11 12:19:54 -04:00
Tzu-ping Chung 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
Dan Ryan d2b0580427 Merge pull request #1902 from vlcinsky/man_tox
Man page section about `tox.ini` updated
2018-04-11 00:18:12 -04:00
Dan Ryan 36b14998c0 Merge branch 'master' into man_tox 2018-04-11 00:16:39 -04:00
Dan Ryan 44d994fd2e Update pipenv.1 2018-04-11 00:16:18 -04:00
Dan Ryan 8d078f8a0b Update advanced.rst 2018-04-11 00:14:05 -04:00
Dan Ryan a60077862c Update advanced.rst 2018-04-11 00:12:58 -04:00
Dan Ryan 3b1330993a Merge pull request #1936 from pypa/test-fixes
Test speedups
2018-04-11 00:10:59 -04:00
Dan Ryan 219d20faca Merge branch 'test-fixes' of github.com:pypa/pipenv into test-fixes 2018-04-10 23:38:25 -04:00
Dan Ryan 620411a924 Equilize test runtimes
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-10 23:37:55 -04:00
Dan Ryan 6dd068eeb2 Merge branch 'master' into test-fixes 2018-04-10 23:29:14 -04:00
Dan Ryan a10b6e2f12 Merge pull request #1826 from frostming/patch-pep423
Only normalize package names when added to Pipfile
2018-04-10 23:19:58 -04:00
Dan Ryan e36c69723d Merge branch 'test-fixes' of github.com:pypa/pipenv into test-fixes 2018-04-10 21:29:47 -04:00
Dan Ryan 4acf3f3d84 Merge branch 'master' of github.com:pypa/pipenv into test-fixes 2018-04-10 21:26:15 -04:00
Dan Ryan ba2f781acd Merge branch 'master' into patch-pep423 2018-04-10 21:16:14 -04:00
Dan Ryan 8db025cada Merge pull request #1949 from pypa/doc-update-git
Update vcs documentation
2018-04-10 21:07:36 -04:00
Dan Ryan c0bff43a70 Merge branch 'master' into doc-update-git 2018-04-10 21:07:28 -04:00
Dan Ryan 74c0df21f2 Merge pull request #1943 from pypa/bugfix/1002-refix
Fix allow_global=system with new resolver
2018-04-10 21:07:04 -04:00
Dan Ryan c84e60cdaa Update vcs documentation
- Add link to pip docs
- Unquote `-e .` example
- Add detail to examples
- Closes #1908

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-10 19:27:30 -04:00
Dan Ryan 1fd34fbe5c Merge branch 'master' of github.com:pypa/pipenv into bugfix/1002-refix
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-10 13:19:42 -04:00
Dan Ryan ce1fa7d8b4 Only resolve wheels
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-10 13:16:20 -04:00
Dan Ryan dfc67d5ff9 Merge branch 'master' of github.com:pypa/pipenv into bugfix/1937-resolve-wheels
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-10 13:02:22 -04:00
Dan Ryan e750927a5f Merge branch 'master' into bugfix/windows-venv-name 2018-04-10 13:00:32 -04:00
Frost Ming b9bd4835ee Improve according to comments 2018-04-10 20:39:51 +08:00