github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-12-22 22:02:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release-0.4.0-20140110.1'

Browse source
This commit is contained in:
Yamashita Yuu 2014-01-10 15:04:36 +09:00
commit 461c5bbc2d
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
## Version History ## Version History
#### 0.4.0-20140110.1
* python-build: Fix build error of CPython 2.x on the platform where the `gcc` is llvm-gcc.
#### 0.4.0-20140110 #### 0.4.0-20140110
* pyenv: Reliably detect parent shell in `pyenv init` (#93) * pyenv: Reliably detect parent shell in `pyenv init` (#93)

2
libexec/pyenv---version
View file

@ -12,7 +12,7 @@
set -e set -e
[ -n "$PYENV_DEBUG" ] && set -x [ -n "$PYENV_DEBUG" ] && set -x
version="0.4.0-20140110" version="0.4.0-20140110.1"
if cd "$PYENV_ROOT" 2>/dev/null; then if cd "$PYENV_ROOT" 2>/dev/null; then
git_revision="$(git describe --tags HEAD 2>/dev/null || true)" git_revision="$(git describe --tags HEAD 2>/dev/null || true)"

2
test/pyenv.bats
View file

@ -5,7 +5,7 @@ load test_helper
@test "blank invocation" { @test "blank invocation" {
run pyenv run pyenv
assert_success assert_success
assert [ "${lines[0]}" == "pyenv 0.4.0-20140110" ] assert [ "${lines[0]}" == "pyenv 0.4.0-20140110.1" ]
} }
@test "invalid command" { @test "invalid command" {