github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-21 20:47:00 -05:00
Code Issues Projects Releases Packages Wiki Activity
1520 commits 2 branches 187 tags 8.8 MiB
Commit graph

1520 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mislav Marohnić
40c1d27445 Merge remote-tracking branch 'origin/master' into version-hooks 2015-12-23 17:22:43 +01:00
Jason Karns
97f0499f43 add version-name/version-origin to hooks completion 2015-12-23 17:22:31 +01:00
Jason Karns
c3a5f91ed0 create hook: version-origin 
Expose a `version-origin` hook.

It is invoked *before* the traditional `rbenv-version-file` lookup. Because `version-origin` is traditionally run immediately after `version-name`, then any plugin hooks that alter `version-name` would have done so. Thus, running `version-origin` prior to printing the origin gives those plugins a chance to alter the `version-origin` to match.

If any of the hooks set `$RBENV_VERSION_ORIGIN`, then it is used as the return value. Otherwise, the existing logic continues to return "environment variable" or "filename" as appropriate.

This change, in conjunction with the `version-name` hook, makes a clean seam by which plugins can inject their own ruby version setting logic. Using this seam, as opposed to altering `$RBENV_COMMAND_PATH` from the `which` hook, means that the version name and origin are set more reliably and so `version`, `version-name`, `version-origin` and `which` all work as expected. Indeed, even PS1 works now.
 2015-12-23 17:22:31 +01:00
Jason Karns
258e4413b1 create hook: version-name 
Expose a `version-name` hook.

It is invoked *after* the traditional `RBENV_VERSION` lookup. Which means hook scripts can interrogate `$RBENV_VERSION_FILE` and/or `$RBENV_VERSION` (or use the executables).

The hooks are then run, giving plugins a chance to alter `RBENV_VERSION`. Once the hooks have run, we now have (in `$RBENV_VERSION`) the actual version we want to use (or it's empty which defaults to `system` per normal). Lastly, the same logic remains for checking if the version exists, or trimming the `ruby-` prefix.

Prime example: the ruby-bundler-ruby-version plugin can select a ruby by using the `ruby` directive from the `Gemfile` if a local `.ruby-version` doesn't exist.
 2015-12-23 17:22:30 +01:00
Mislav Marohnić
a62a75369e Merge branch 'rbenv-local-respects-ancestry' 2015-12-23 15:30:18 +01:00
Mislav Marohnić
ba072adcb9 Have rbenv local read version from parent directories as well 
Fixes #807
 2015-12-23 15:21:24 +01:00
Mislav Marohnić
ca25259900 Allow explicit target directory argument to rbenv-version-file 
Can be used for `.ruby-version` file lookup in the ancestry of a
specific directory. In this mode of operation, global version files
aren't taken into consideration, and the command fails unless a local
version file was found.
 2015-12-23 15:19:54 +01:00
Yamashita, Yuu
4c06f23aaf Run rehash after conda install 2015-12-23 08:09:40 +00:00
Yamashita, Yuu
046f5bde02 Add miniconda latest 2015-12-23 07:54:47 +00:00
Yamashita, Yuu
c678bb1eaa Add anaconda[23]-2.4.1 2015-12-23 07:41:52 +00:00
Yamashita, Yuu
5e72a4c3e3 Add miniconda[23]-3.19.0 2015-12-23 06:57:51 +00:00
Yamashita, Yuu
23669162c0 Rename anaconda/miniconda to anaconda2/miniconda2 2015-12-23 06:54:28 +00:00
Yamashita, Yuu
01835c2682 Merge pull request #511 from dirn/cpython-3.4.4 
Add CPython 3.4.4
 2015-12-23 01:00:11 +09:00
Andy Dirnberger
4243ac6ffc Add CPython 3.4.4 2015-12-22 10:58:48 -05:00
Yamashita, Yuu
b0f29d511a v20151222 2015-12-22 10:45:34 +00:00
Yamashita, Yuu
3031cb9750 Add workaround for test failure on Arch Linux (#480) 2015-12-20 12:29:30 +00:00
Yamashita, Yuu
6bcb1d6211 Merge pull request #510 from yyuu/no-ssl3-for-py30-py31-py32 
`OPENSSL_NO_SSL3` patch for 3.0.x, 3.1.x and 3.2.x
 2015-12-20 16:54:04 +09:00
Yamashita, Yuu
3d1ba0c58c Add OPENSSL_NO_SSL2 & OPENSSL_NO_SSL3 patch for 3.0.1, 3.1 and 3.1.2 2015-12-20 07:46:36 +00:00
Yamashita, Yuu
68e8945f74 Add OPENSSL_NO_SSL2 & OPENSSL_NO_SSL3 patch for 3.1.3 2015-12-20 07:46:01 +00:00
Yamashita, Yuu
3ddbb19663 Add OPENSSL_NO_SSL3 patch for 3.1.4 .. 3.1.5 2015-12-20 07:45:39 +00:00
Yamashita, Yuu
763a30bb1d Add OPENSSL_NO_SSL3 patch for 3.2 2015-12-20 07:16:08 +00:00
Yamashita, Yuu
9a33ce643e Add OPENSSL_NO_SSL3 patch for 3.2.1 2015-12-20 07:15:57 +00:00
Yamashita, Yuu
b29c54ee0a Add OPENSSL_NO_SSL3 patch for 3.2.2 2015-12-20 07:15:46 +00:00
Yamashita, Yuu
58275fc52b Add OPENSSL_NO_SSL3 patch for 3.2.3 .. 3.2.6 2015-12-20 06:55:46 +00:00
Yamashita, Yuu
dc4b355aad Update OPENSSL_NO_SSL3 patch for 3.3.x to remove unnecessary imports 2015-12-20 06:55:46 +00:00
Yamashita, Yuu
9f1daac9f7 Merge pull request #507 from yyuu/openssl-no-ssl3 
`OPENSSL_NO_SSL3` patch for 2.6, 2.7, 3.3 and 3.4
 2015-12-18 23:59:25 +09:00
Yamashita, Yuu
471fa24531 Add OPENSSL_NO_SSL2 & OPENSSL_NO_SSL3 patch for 2.6.6 .. 2.6.8 2015-12-18 14:54:04 +00:00
Yamashita, Yuu
f228825879 Add OPENSSL_NO_SSL2 & OPENSSL_NO_SSL3 patch for 2.6.9 2015-12-18 14:53:39 +00:00
Yamashita, Yuu
8c96897495 Add OPENSSL_NO_SSL2 & OPENSSL_NO_SSL3 patch for 2.7 .. 2.7.1 2015-12-18 14:25:01 +00:00
Yamashita, Yuu
659e532701 Add OPENSSL_NO_SSL3 patch for 2.7.2 2015-12-18 14:24:49 +00:00
Yamashita, Yuu
5f0056886a Add OPENSSL_NO_SSL3 patch for 2.7.3 .. 2.7.8 2015-12-18 14:24:37 +00:00
Yamashita, Yuu
bc322b0238 Add OPENSSL_NO_SSL3 patch for 2.7.9 2015-12-18 14:24:22 +00:00
Yamashita, Yuu
6251c3bad5 Add OPENSSL_NO_SSL3 patch for 3.3.x 2015-12-18 13:47:09 +00:00
Yamashita, Yuu
526fa03968 Add OPENSSL_NO_SSL3 patch for 3.4.x 2015-12-18 13:46:56 +00:00
Yamashita, Yuu
d6e0120cc8 Use http://www.python.org instead of http://python.org since former is configured to use fast.ly 
```
% dig python.org. A
;; ->>HEADER<<- opcode: QUERY, rcode: NOERROR, id: 9216
;; flags: qr rd ra ; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 0
;; QUESTION SECTION:
;; python.org.  IN      A

;; ANSWER SECTION:
python.org.     5       IN      A       104.130.43.121

;; AUTHORITY SECTION:

;; ADDITIONAL SECTION:

;; Query time: 3 msec
;; SERVER: 192.168.44.2
;; WHEN: Wed Dec 16 06:08:20 2015
;; MSG SIZE  rcvd: 44
```

```
% dig www.python.org. A
;; ->>HEADER<<- opcode: QUERY, rcode: NOERROR, id: 22050
;; flags: qr rd ra ; QUERY: 1, ANSWER: 2, AUTHORITY: 0, ADDITIONAL: 0
;; QUESTION SECTION:
;; www.python.org.      IN      A

;; ANSWER SECTION:
www.python.org. 5       IN      CNAME   python.map.fastly.net.
python.map.fastly.net.  5       IN      A       103.245.222.223

;; AUTHORITY SECTION:

;; ADDITIONAL SECTION:

;; Query time: 7 msec
;; SERVER: 192.168.44.2
;; WHEN: Wed Dec 16 06:08:23 2015
;; MSG SIZE  rcvd: 83
```
 2015-12-16 06:07:48 +00:00
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