kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,925 Commits 9 Branches 297 Tags
748be894355d20d4a2fd3cc113bb2cf9c0d625f5
Commit Graph

3925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Ryan 748be89435 Set python encoding to utf-8 for jenkins 
Signed-off-by: Dan Ryan <dan@danryan.co>
 2018-04-13 21:11:54 -04:00
Dan Ryan 40d6259224 Change relative import of requirements 
Signed-off-by: Dan Ryan <dan@danryan.co>
 2018-04-13 21:10:57 -04:00
Dan Ryan a8729f0222 Fix jenkins tests 
Signed-off-by: Dan Ryan <dan@danryan.co>
 2018-04-13 21:10:55 -04:00
Dan Ryan a36239ff68 Make all imports relative 
Signed-off-by: Dan Ryan <dan@danryan.co>
 2018-04-13 21:02:43 -04:00
Dan Ryan 80ff4e2208 Merge pull request #1989 from hroncok/nolevenshtein 
Remove unused Levenshtein library
 2018-04-13 14:53:48 -04:00
Miro Hrončok f41ca09aa0 Remove unused Levenshtein library 
It's GPL :(

See https://github.com/pypa/pipenv/issues/1961
 2018-04-13 17:37:52 +02:00
Dan Ryan ca1755a5f4 Merge pull request #1985 from hroncok/licenses_vendor2 
More vendor licenses
 2018-04-13 10:39:06 -04:00
Dan Ryan a3863c4665 Merge branch 'master' into licenses_vendor2 2018-04-13 10:38:14 -04:00
Dan Ryan 3e59127b94 Merge pull request #1979 from pypa/feature/better-messaging-system-no-pipfile 
Improve error messages with `--system`
 2018-04-13 10:34:52 -04:00
Dan Ryan 3045d06969 Merge branch 'master' of github.com:pypa/pipenv into feature/better-messaging-system-no-pipfile 2018-04-13 10:33:00 -04:00
Dan Ryan b1186e6875 Improve error messages with --system 
- Tell users when `--system` fails because no pipfile is found
- Add a space to other `--system` message

Signed-off-by: Dan Ryan <dan@danryan.co>
 2018-04-13 10:32:23 -04:00
Dan Ryan 5fcb3aa8aa Merge pull request #1956 from Purring/master 
Add section about PIPENV_CACHE_DIR in documentation
 2018-04-13 10:25:11 -04:00
Miro Hrončok 149c1f145a Add LICENSE file for bundled requirements 
From https://github.com/davidfischer/requirements-parser/blob/master/LICENSE.rst

See https://github.com/pypa/pipenv/issues/1961#issuecomment-381006805
 2018-04-13 14:30:42 +02:00
Miro Hrončok 3a6926f577 Add LICENSE files for 4rd party libraries (bundled with requests) 
requests.chardet: LGPLv2 from https://github.com/chardet/chardet/blob/master/LICENSE
  requests.urllib3: MIT from https://github.com/urllib3/urllib3/blob/master/LICENSE.txt

See https://github.com/pypa/pipenv/issues/1961
 2018-04-13 14:28:53 +02:00
Tzu-ping Chung ab0303adbe Merge branch 'master' into master 2018-04-13 14:06:51 +08:00
Dan Ryan fb39a8aa3a Merge pull request #1978 from pypa/bugfix/windows-venv-search 
Don't always subscript venv names when searching
 2018-04-13 01:21:28 -04:00
Cody 828652680e Merge branch 'master' into master 2018-04-12 23:13:21 -04:00
Dan Ryan 861aa83085 Merge branch 'master' into bugfix/windows-venv-search 2018-04-12 22:55:33 -04:00
Dan Ryan 40e019e3f8 Merge pull request #1970 from hroncok/licenses 
Add licenses for 3rd party libraries
 2018-04-12 22:55:25 -04:00
Dan Ryan e207cae32b Merge branch 'master' into licenses 2018-04-12 22:55:18 -04:00
Dan Ryan 9e2830bd12 Merge branch 'master' into bugfix/windows-venv-search 2018-04-12 22:55:07 -04:00
Dan Ryan 674a2c7106 Merge pull request #1971 from pypa/fix-python-version-parsing 
Fix Python version parsing
 2018-04-12 22:54:57 -04:00
Dan Ryan 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
Dan Ryan 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
Dan Ryan 2f4c0e92a8 Merge branch 'master' into licenses 2018-04-12 19:19:34 -04:00
Dan Ryan 31b6f1ba7a Merge branch 'master' into fix-python-version-parsing 2018-04-12 18:50:38 -04:00
Dan Ryan 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
Dan Ryan 0c334b304c Merge branch 'master' into no-outdated-version 2018-04-12 18:49:18 -04:00
Dan Ryan 3fa64125c2 Fix create_pipfile version parsing 
Signed-off-by: Dan Ryan <dan@danryan.co>
 2018-04-12 18:43:05 -04:00
Dan Ryan 3859d5f803 Don't always subscript venv names when searching 
- Causes a bug on windows (verbally reported to me at work)
/cc @stephen.bunn if you can provide a log when you get a sec

Signed-off-by: Dan Ryan <dan@danryan.co>
 2018-04-12 18:16:07 -04:00
Miro Hrončok 8c3fa7f19a Mention 3rd party LICENSEs in NOTICES 2018-04-12 21:22:32 +02:00
Miro Hrončok 7afbcaec96 Add a note about updating LICENSE files to vendor/patched READMEs 2018-04-12 20:47:04 +02:00
Miro Hrončok 02e67a324f Include LICENSE files in sdist 2018-04-12 20:47:04 +02:00
Miro Hrončok 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
Miro Hrončok 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
Dan Ryan 5458817b8b Merge branch 'master' into fix-python-version-parsing 2018-04-12 14:32:59 -04:00
Grey Baker 495ba0f94e Check whether dependency exists in old lockfile during keep-updated lock 2018-04-12 18:33:13 +01: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