Commit graph

1535 commits

Author SHA1 Message Date
Daniel Hahler
66bd348600 Merge pull request #504 from blueyed/merge-rbenv
Merge rbenv/master
2015-12-14 14:13:42 +01:00
Daniel Hahler
03ece82197 Merge remote-tracking branch 'rbenv/master'
Using `git merge rbenv/master -s recursive -X rename-threshold=5%`.

Conflicts:
	README.md
	bin/python-local-exec
	libexec/pyenv
	libexec/pyenv-help
	test/--version.bats
2015-12-14 13:47:11 +01:00
Mislav Marohnić
90373d78b9 Add test for not including current directory in PATH search
Confirms #836
2015-12-14 11:59:01 +01:00
Mislav Marohnić
dc23ef10b6 Merge pull request #836 from eagletmt/fix-path
Remove leading `:`
2015-12-12 15:22:36 +01:00
Kohei Suzuki
3c7a13d81f Remove leading : 2015-12-12 15:28:34 +09:00
Yamashita, Yuu
e66dcf258c curl bundled with Anaconda does not work on Debian 2015-12-11 08:28:51 +00:00
Yamashita, Yuu
fab6a0fcd1 v20151210 2015-12-10 08:27:05 +00:00
Josh Friend
c4968f7a48 Add CPython 3.4.4rc1 2015-12-09 16:09:18 -05:00
Josh Friend
d0e9cd7d7e Remove old 2.7.11 release candidate 2015-12-09 16:09:18 -05:00
Yamashita, Yuu
3185dee8a2 Copied OPENSSL_NO_SSL3 patch to 2.7 series (#495) 2015-12-09 01:18:41 +00:00
Yamashita, Yuu
05615587d0 Merge pull request #495 from catlee/master
Adding SSL patch to build 2.7.3 on Debian
2015-12-09 08:58:23 +09:00
Mislav Marohnić
20755cfc15 Merge pull request #833 from chulkilee/fix-url
update urls to rbenv
2015-12-07 20:47:06 +01:00
Chulki Lee
df4c16ecb4 update urls to rbenv 2015-12-07 11:03:07 -08:00
Yamashita, Yuu
132179d0ca Merge pull request #498 from ipfans/master
Add CPython 3.5.1
2015-12-07 16:14:31 +09:00
ipfans
b6cdfcf5dc Upgrade OpenSSL to 1.0.1q 2015-12-07 15:13:04 +08:00
ipfans
c78f079078 Add CPython 3.5.1 2015-12-07 14:59:48 +08:00
Yamashita, Yuu
2767461235 Use PYENV_BOOTSTRAP_VERSION during python-build if declared 2015-12-07 05:10:11 +00:00
Yamashita, Yuu
20432dda88 Add a workaround for Anaconda's curl issue
Anaconda's `curl` doesn't work with HTTPS on platfroms where
`/etc/pki/tls/certs/ca-bundle.crt` isn't available.
2015-12-07 04:22:41 +00:00
Yamashita, Yuu
f27e3ebb94 Update OpenSSL version for 2.7.11 (#496) 2015-12-07 01:38:50 +00:00
Yamashita, Yuu
7718afbca2 Merge branch 'issue496' 2015-12-07 10:35:11 +09:00
Yamashita, Yuu
28766056b2 Update OpenSSL to 1.0.1q (fixes #496) 2015-12-07 01:23:14 +00:00
Chris AtLee
dbf8b2fb65 Adding SSL patch to build 2.7.3 on Debian 2015-12-06 09:53:05 -05:00
Yamashita, Yuu
aaec35859d Merge pull request #494 from zmwangx/cpython-2.7.11
Add CPython 2.7.11
2015-12-06 10:10:59 +09:00
Zhiming Wang
54f7944ae2
Add CPython 2.7.11 2015-12-05 17:08:29 -08:00
Yamashita, Yuu
96bfa1532d Skip virtualenv aliases as well (yyuu/pyenv-virtualenv#126) 2015-12-02 09:52:33 +00:00
Yamashita, Yuu
ebd6c1aee3 Add comments to Anaconda executables (#491) 2015-11-29 23:50:30 +00:00
Yamashita, Yuu
a8f8f0ae0c Merge pull request #491 from yyuu/anaconda-which-ext
Add a default hook for Anaconda to look for original `$PATH`
2015-11-28 12:51:00 +09:00
Yamashita, Yuu
a50d0492b3 Merge pull request #490 from ReadmeCritic/master
Update README URLs based on HTTP redirects
2015-11-28 12:50:31 +09:00
Yamashita, Yuu
a6dbb11dca Add a default hook for Anaconda to look for original $PATH 2015-11-28 03:47:00 +00:00
ReadmeCritic
43abe13db9 Update README URLs based on HTTP redirects 2015-11-27 19:12:54 -08:00
Mislav Marohnić
f0e8bdcdaf Merge pull request #830 from ReadmeCritic/master
Update README URLs based on HTTP redirects
2015-11-25 19:49:54 +01:00
ReadmeCritic
f85c41b14f Update README URLs based on HTTP redirects 2015-11-25 10:08:28 -08:00
Mislav Marohnić
75a1dd25cd Merge pull request #828 from jasonkarns/formatting
indentation
2015-11-24 17:22:33 +01:00
Yamashita, Yuu
465bd1f3e8 v20151124 2015-11-24 01:08:46 +00:00
Yamashita, Yuu
96be89835e Add PyPy 4.0.1 (fixes #489) 2015-11-24 01:01:33 +00:00
Jason Karns
a1ef9efc80 use PWD var over pwd command 2015-11-23 09:13:31 -05:00
Jason Karns
87dd5fe2c0 indentation 2015-11-23 09:13:31 -05:00
Josh Friend
3428431aef Add CPython 2.7.11 RC1 2015-11-22 11:50:21 -05:00
Yamashita, Yuu
8841f7788d Merge pull request #487 from yyuu/rbenv-20151121
rbenv 20151121
2015-11-21 13:28:26 +09:00
Yamashita, Yuu
8da3749648 Merge remote-tracking branch 'rbenv/master' into rbenv-20151121 2015-11-21 04:21:14 +00:00
Yamashita, Yuu
94bce8abf8 Merge pull request #486 from yyuu/ruby-build-20151028
Import changes from ruby-build v20151028
2015-11-21 12:12:26 +09:00
Yamashita, Yuu
f62ee1a4db Import changes from ruby-build v20151028 2015-11-21 02:59:36 +00:00
Yamashita, Yuu
e7b0d99601 Merge pull request #485 from brittag/readme-improvements
Readme improvements: correcting errors and clarifying Homebrew instructions
2015-11-21 10:44:41 +09:00
Mislav Marohnić
5fb9c84e14 Merge pull request #822 from jasonkarns/completion
Add --help and tab completion to rbenv-versions
2015-11-20 18:37:54 +01:00
Mislav Marohnić
d138f5f5e4 Merge pull request #826 from jasonkarns/fail-helper
Extract `fail` helper function
2015-11-20 18:29:34 +01:00
Jason Karns
3ddedc021a Extract abort helper function
fail helper prints message to stderr and exits 1
(prefixes 'rbenv: ' if given a string arg)
2015-11-20 10:25:46 -05:00
Mislav Marohnić
a22adc77eb Merge pull request #827 from jasonkarns/fix-exec-test
Fix leftover .ruby-version file from exec.bats
2015-11-20 16:00:49 +01:00
Jason Karns
a3ff3adc39 create local .ruby-version file in test dir
This new test was creating an (intentionally invalid) .ruby-version file
in current working directory; typically the rbenv project dir.
Immediately after test runs, I had a leftover .ruby-version file.

The version-file tests create and cd into the RBENV_TEST_DIR as part of
setup(). I'm using the same directory for this test fix, but am only
using it for this particular test. None of the other exec tests seem to
need to be in a temp test dir, so no use putting it in setup().
2015-11-20 09:51:44 -05:00
Jason Karns
2dcb9d0611 completions for rbenv-init 2015-11-20 09:20:01 -05:00
Jason Karns
a6cb4b6317 consistent completions for rbenv-help 2015-11-20 09:15:06 -05:00