Commit Graph

5869 Commits

Author SHA1 Message Date
Dan Ryan 68b6786d86 Merge branch 'master' into windows-cmder-root-space-escape-fix 2018-05-22 22:33:03 -04:00
Kyle Altendorf 81b1d917b8 Merge branch 'master' into 2138-notpip_looping 2018-05-21 11:21:04 -04:00
kennethreitz 7a85412cab Merge branch 'master' into docker 2018-05-20 10:47:40 -04:00
kennethreitz 92290cb2f6 stick to traditional tests for now
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-20 10:35:13 -04:00
kennethreitz c2495dcd99 update makefile
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-20 10:33:54 -04:00
kennethreitz 4361cf7f3a empty commit 2018-05-20 10:25:30 -04:00
kennethreitz 41f838c1cc Merge branch 'master' into update-piptools 2018-05-20 10:22:02 -04:00
kennethreitz 9d45786433 Merge pull request #2215 from greyli/patch-2
Add tips for Supervisor user
2018-05-20 10:21:35 -04:00
kennethreitz a51d4c5150 Merge branch 'master' into patch-2 2018-05-20 10:13:46 -04:00
kennethreitz 0343454988 pipenv-tests
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-20 10:12:00 -04:00
kennethreitz 439c0089cb also install git
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-20 10:02:54 -04:00
kennethreitz 86aee384e1 also build time
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-20 09:57:10 -04:00
kennethreitz 1f495db509 docker-compose based tests
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-20 09:54:27 -04:00
kennethreitz 4845552560 new dockerfile for ubuntu 18.04
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-20 09:42:19 -04:00
kennethreitz 47debed9a1 simplicity
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-19 14:34:18 -04:00
kennethreitz fe78628903 opinionated
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-19 14:25:27 -04:00
kennethreitz 5e8ed12cfd readme
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-19 14:20:17 -04:00
kennethreitz e3c72e167d cleanup
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-19 14:18:27 -04:00
kennethreitz 1c956d37e6 one line
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-19 14:16:47 -04:00
kennethreitz 6d77e4a055 let's be honest here
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-19 14:15:02 -04:00
Grey Li 52c9953334 Merge branch 'master' into patch-2 2018-05-19 08:53:34 +08:00
Kyle Altendorf 4f92007f6a Merge branch 'master' into 2138-notpip_looping 2018-05-18 15:14:06 -04:00
kennethreitz 7e596306f4 pipenv-pipes
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-18 14:23:12 -04:00
Grey Li 4d2746df57 Add tips for supervisor user 2018-05-18 15:56:20 +08:00
Dan Ryan 7227c9b2c9 Fix pip compat imports for piptools
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-17 18:51:53 -04:00
Dan Ryan 8abb764ce8 Update pypi urls
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-17 14:43:09 -04:00
Dan Ryan 7151583f1c Revendor piptools for update
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-17 14:29:50 -04:00
Dan Ryan 9986c75d68 Update patches
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-17 14:29:50 -04:00
Dan Ryan 0dbc5c6871 Update piptools patch
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-17 14:29:49 -04:00
Dan Ryan 45dc5d10ec Update patched version of pip-tools for vendoring
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-17 14:29:49 -04:00
Dan Ryan 92c7328d14 Drop cacert.pem copy task from vendor script
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-17 14:29:49 -04:00
Dan Ryan 957fdd8163 Merge branch 'master' into bugfix/vcs-updates 2018-05-17 12:10:02 -04:00
Kyle Altendorf dcbbe91358 Merge branch 'master' into 2138-notpip_looping 2018-05-17 09:12:34 -04:00
Tzu-ping Chung ccf02f5ad5 Merge pull request #1861 from meshy/pew-associate-project-dir
Associate project dir with new virtual environment
2018-05-17 18:34:57 +08:00
Tzu-ping Chung 664bd93bdb Merge branch 'master' into pew-associate-project-dir 2018-05-17 16:52:30 +08:00
Tzu-ping Chung 85c641de6a Merge pull request #2199 from PieterjanMontens/feature/graph-nested-json
Added nested json output to pipenv graph command
2018-05-17 16:51:39 +08:00
Kyle Altendorf 3b7929daa8 Add a few test cases for PackageFinder.get_extras_links() 2018-05-16 23:07:09 -04:00
Kyle Altendorf 1eb56b458b @classmethod PackageFinder.get_extras_links() until it moves
Not that I like @classmethod but it is honest here and lets the function be tested directly.
2018-05-16 21:56:49 -04:00
Dan Ryan f1550d8480 Lock vcs deps to exact commit with dependencies
- Manually obtain and update VCS repository with exact commit
 - Always store exact commit in the lockfile
 - Fixes #2180, #1690, #1611, #2096

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-16 17:37:09 -04:00
Dan Ryan 7b9b19c723 Lock vcs refs properly
- Still need to actually run setup.py

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-16 17:37:09 -04:00
Kyle Altendorf 4ac10807bc Merge branch 'master' into 2138-notpip_looping 2018-05-16 11:15:29 -07:00
kennethreitz 70a7b2bb53 Merge branch 'master' into feature/graph-nested-json 2018-05-16 12:33:24 -04:00
kennethreitz c10b275dab keep travis out of here
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-16 12:31:46 -04:00
kennethreitz a6611d280c Merge branch 'master' into feature/graph-nested-json 2018-05-16 12:12:02 -04:00
kennethreitz 5e503e5b26 one line
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-16 12:09:13 -04:00
kennethreitz 171bb99e94 even shorter
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-16 12:08:48 -04:00
kennethreitz 5853846f5d pipenv shortened
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-16 12:07:56 -04:00
kennethreitz 9350939799 Merge branch 'master' into feature/graph-nested-json 2018-05-16 12:04:39 -04:00
kennethreitz d3d02c7dc2 Merge pull request #2205 from pypa/contributing_docs
adding contribution docs and guidelines to Pipenv
2018-05-16 11:49:12 -04:00
Nate Prewitt 968223448a adding contribution docs and guidelines to Pipenv 2018-05-16 08:44:52 -07:00