Jeff Tratner
7afa528c0f
Fix small test case typo
2018-03-28 23:54:00 -07:00
Jeff Tratner
b0445a2c0b
Lint fixes
...
Fix up tests a little more
Use temp_environ rather than monkeypatch
2018-03-27 15:30:22 -04:00
luz.paz
63f7e988f7
Misc. typos
...
Found via `codespell -q 3`
2018-03-27 13:42:27 -04:00
Donald Patterson
f5f24b47e5
Combine RUN apt-get calls in Dockerfile
...
- with the calls in separate lines, there can be caching issues
- changed `apt` to `apt-get` to stop instability warnings
2018-03-27 13:41:55 -04:00
frostming
419e0310e4
update Pipfile.lock
2018-03-27 02:18:34 -04:00
Tzu-ping Chung
b6a333be87
Set -o pipefail so errors propagate through piping
...
This prevents the pipe syntax in the $TAP_OUTPUT branch from masking
the underlying pytest failure.
2018-03-26 23:18:37 -04:00
Tzu-ping Chung
874ddfc0b2
Merge pull request #1842 from pypa/bugfix/windows-pipfile-scripts
...
Fix `shlex.split()` call to check for posix first
2018-03-26 18:32:10 +08:00
Tzu-ping Chung
c590e80449
Some tests for the scripts section
2018-03-26 15:48:06 +08:00
Dan Ryan
b91a439727
Merge branch 'master' into bugfix/windows-pipfile-scripts
2018-03-25 19:22:32 -04:00
Tzu-ping Chung
0ec97edbf7
Merge pull request #1844 from davilima6/typo
...
fix typo
2018-03-26 02:42:19 +08:00
Davi Lima
01d56cc8a0
fix typo
2018-03-25 19:37:55 +02:00
Tzu-ping Chung
7d204ac474
Merge pull request #1840 from jtratner/detect-dotvenv-in-subdirectories
...
Detect .venv at project root when in subdirectory
2018-03-25 13:49:01 +08:00
Dan Ryan
052c57c59c
Don't use six.u
2018-03-24 14:18:26 -04:00
Dan Ryan
844bc3f7d1
Fix pipenv scripts for windows shell
2018-03-24 12:45:46 -04:00
Dan Ryan
f36f7ca1bc
Fix shlex.split() call to check for posix first
...
- Currently it assumes posix complience and uses `posix=True`
- This breaks when parsing on windows
2018-03-23 23:48:44 -04:00
Jeff Tratner
ca19061d87
Add doc note about lock hash too
2018-03-23 15:35:12 -07:00
Jeff Tratner
ebf5ed843b
Detect .venv at project root when in subdirectory
...
Also remove `PIPENV_SHELL_COMPAT` which appears to be no longer used.
(confirmed test case fails without this change and passes with it).
2018-03-23 15:35:12 -07:00
Tzu-ping Chung
c7cd4bd864
Merge pull request #1836 from jtratner/fix-env-calculation-with-hashes
...
Fix env calculation with hashes
2018-03-23 16:06:13 +08:00
Jeff Tratner
5cf7a7d552
Add doc note about environment variables
2018-03-23 00:17:28 -07:00
Jeff Tratner
8f79f13ea4
Split hash function into two
2018-03-23 00:11:34 -07:00
Jeff Tratner
1f31f40f2b
clean up hash change calc
...
Add test case for pipenv hash changing
2018-03-23 00:11:34 -07:00
Jeff Tratner
ff84219171
Do not inject env when calculating hashes
2018-03-23 00:11:34 -07:00
Tzu-ping Chung
0123161619
Merge pull request #1821 from uranusjr/more-diagnose
...
More documentation
2018-03-23 14:53:26 +08:00
Tzu-ping Chung
e2aae966d5
More pyenv notes
2018-03-23 13:21:43 +08:00
Tzu-ping Chung
ff6e538c1a
Locale debug
2018-03-23 13:21:43 +08:00
Tzu-ping Chung
60a762b4c6
Manually delete caches
2018-03-23 13:21:43 +08:00
Tzu-ping Chung
01a89c9508
Line ending
2018-03-23 13:21:43 +08:00
Tzu-ping Chung
256f8d75bd
Reword
2018-03-23 13:21:42 +08:00
Dan Ryan
2e9337f0fd
Merge pull request #1817 from rconradharris/stable-sort-hashes
...
Pipfile.lock hashes back to determinitic order
2018-03-22 19:10:58 -04:00
Dan Ryan
d3fb799882
Merge branch 'master' into stable-sort-hashes
2018-03-22 18:50:01 -04:00
Dan Ryan
6944a2969a
Merge pull request #1825 from uranusjr/markers-test
...
Add tests for environment marker precedence logic
2018-03-22 18:49:26 -04:00
Dan Ryan
62d1ae703e
Merge branch 'master' into markers-test
2018-03-22 17:01:58 -04:00
Dan Ryan
1c8666b30e
Merge pull request #1822 from uranusjr/requests-pem
...
Add requests's pem file to distribution
2018-03-22 14:20:10 -04:00
Tzu-ping Chung
306714c053
Need to test markers
2018-03-23 01:59:55 +08:00
Tzu-ping Chung
e51b5d0996
Add tests for environment marker precedence logic
...
Close #1757 .
2018-03-23 01:56:27 +08:00
Tzu-ping Chung
794786bced
Add requests's pem file to distribution
...
Maybe fix #1800 ?
2018-03-22 14:16:22 +08:00
Rick Harris
f891334a0d
Pipfile.lock hashes back to deterministic order
...
The intent has been for hashes to be in a stable order to minimize diff
noise. Commit 1fa3e2a567 caused a
regression here by converting to a set and back.
This patch also removes unecessary `sorted` calls that were added in
4d8e01b80f . Since sorting is done at the
last possible moment, sorting beforehand is a waste.
Fixes #1529
Fixes #1664
2018-03-21 13:12:54 -05:00
Dan Ryan
29a1a0b537
Merge pull request #1815 from pypa/editable-packages-fixes
...
Fix detection of editable packages
2018-03-21 12:58:08 -04:00
Tzu-ping Chung
49cb2b087a
Add test to go through the editable check code path
...
This would have failed without the previous commit.
2018-03-21 23:32:58 +08:00
Tzu-ping Chung
c8562129de
Fix editable package filtering logic
...
Pipfile entry values can be strings; need to check if they actually have a
"get" method before accessing. Also extract the logic into utils.py so it
lives with other functions similar to it.
2018-03-21 21:29:41 +08:00
Tzu-ping Chung
25a2186b0a
dev_editable_packages => editable_dev_packages
2018-03-21 21:27:31 +08:00
kennethreitz
6af66f9c08
getting creative
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Signed-off-by: Kenneth Reitz <me@kennethreitz.org >
2018-03-21 08:02:02 -04:00
kennethreitz
4426caa315
Merge branch 'master' of github.com:pypa/pipenv
2018-03-21 07:53:59 -04:00
kennethreitz
b3c509c11c
Revert "delete .travis.yml"
...
This reverts commit 37251a1fd9 .
2018-03-21 07:53:47 -04:00
kennethreitz
424b127b1a
Merge pull request #1813 from mmasztalerczuk/bugfix/incorrect-path
...
Fix problem with incorrect import path
2018-03-21 07:52:57 -04:00
Mariusz Masztalerczuk
ce0bf71f0a
Merge branch 'master' into bugfix/incorrect-path
2018-03-21 12:51:39 +01:00
Mariusz Masztalerczuk
0ac8eb3f9c
Fix problem with incorrect import path
2018-03-21 12:40:28 +01:00
kennethreitz
b1b1208caf
Merge branch 'master' of github.com:pypa/pipenv
2018-03-21 07:11:05 -04:00
kennethreitz
7cd4bf13b2
version bump
...
Signed-off-by: Kenneth Reitz <me@kennethreitz.org >
2018-03-21 07:10:55 -04:00
kennethreitz
6f0c1afea7
history
...
Signed-off-by: Kenneth Reitz <me@kennethreitz.org >
2018-03-21 07:10:44 -04:00