Daniel Hahler
c754efc44b
Merge pull request #378 from blueyed/version-file-read-without-type
...
pyenv-version-file-read: use sed instead of type/head/awk
2015-05-18 16:37:09 +02:00
Yamashita, Yuu
46ffb0c8df
Merge pull request #290 from blueyed/version-handle-missing-better
...
Improve `pyenv version`, if there is one missing
2015-05-17 12:05:03 +09:00
Yamashita, Yuu
70cce28ba3
Merge pull request #368 from blueyed/pip-rehash-for-versions
...
pip-rehash: handle versions in commands, like "pip2" and "pip3.4"
2015-05-17 11:35:31 +09:00
Daniel Hahler
9156191168
pyenv-version-file-read: use sed/cut instead of type/head/awk
...
I was seeing the following occasionally in scripts:
> …/.pyenv/libexec/pyenv-version-file-read: line 12: type: write error: Broken pipe
This patch hopefully improves/fixes this, and it seems better anyway to
just use sed here.
2015-05-16 23:02:00 +02:00
Yamashita, Yuu
5402ce423b
Merge pull request #376 from thomasjo/tj-fix-bad-anaconda-urls
...
Fix broken Anaconda3 2.2.0 URLs
2015-05-12 20:06:11 +09:00
Thomas Johansen
2ea2e7558d
Fix broken Anaconda3-2.2.0 URLs
2015-05-12 12:52:41 +02:00
Yamashita, Yuu
9d8da866f1
Merge pull request #375 from kuanyili/anaconda
...
Add Anaconda/Anaconda3 2.2.0 and Miniconda/Miniconda3 3.9.1 definitions
2015-05-12 07:30:51 +09:00
Kuan-Yi Li
70fa356585
Add Miniconda/Miniconda3 3.9.1 definitions
2015-05-12 01:50:29 +08:00
Kuan-Yi Li
31fb290de2
Add Anaconda/Anaconda3 2.2.0 definitions
2015-05-12 01:19:04 +08:00
Josh Friend
e285f2e5b1
use full path when installing a jar
2015-05-04 10:35:34 -04:00
Josh Friend
1d31529b46
v20150404
2015-05-04 08:25:25 -04:00
Josh Friend
6f40dae3d7
Merge pull request #371 from yyuu/fix-py3.1-pip
...
Fix Pip install on python 3.1.x
2015-05-04 08:18:22 -04:00
Josh Friend
d2794f54e5
add a few missing python 3.1.x releases
2015-05-04 08:13:07 -04:00
Josh Friend
bc03106cee
pin pip version to 1.5.6 for python 3.1 ( fixes #351 )
2015-05-04 08:12:38 -04:00
Yamashita, Yuu
bf93b90282
Merge pull request #370 from joshfriend/jython-2-7-0
...
Add jython 2.7.0
2015-05-04 13:46:29 +09:00
Josh Friend
7b8bd11416
fix jython pip and add warning about JAVA_HOME for osx/windows users
2015-05-04 00:37:41 -04:00
Josh Friend
f623231734
Add jython 2.7.0
2015-05-03 22:24:36 -04:00
Daniel Hahler
481198d255
pip-rehash: handle versions in commands, like "pip2" and "pip3.4"
...
Fixes https://github.com/yyuu/pyenv/issues/367
2015-04-30 00:49:53 +02:00
Yamashita, Yuu
50d5de4731
Merge pull request #364 from joshfriend/python-3-5-0-a4
...
Add Python-3.5.0a4
2015-04-21 08:31:21 +09:00
Josh Friend
15977c852d
add python3.5.0a4
2015-04-20 18:42:17 -04:00
Daniel Hahler
10d5d9a24f
tests: fix desc for "can add shims to PATH more than once"
...
This seems to have not been merged properly.
A similar issue is with the test for fish, which has been submitted as a
PR for rbenv: https://github.com/sstephenson/rbenv/pull/722 .
2015-04-20 00:00:04 +02:00
Yamashita, Yuu
be037932ca
Merge pull request #360 from yyuu/merge-rbenv
...
Merge rbenv to have a common ancestor for future merges
2015-04-19 18:00:19 +09:00
Yamashita, Yuu
af95960960
Merge pull request #362 from n8henrie/master
...
Details on multiple Python2 and Python3 versions.
2015-04-19 08:36:33 +09:00
Nathan Henrie
17c153b1c1
Details on multiple Python2 and Python3 versions.
...
Add detail regarding activating multiple Python2 and Python3 versions simultaneously.
2015-04-17 16:59:04 -06:00
Daniel Hahler
065f5578b1
Merge rbenv parent repository
...
This merges
4d72eefffc
to build a common ancestor for future merges.
This is branched off f48a5b11d7
, which was
the last manual merge.
Discussion / initial idea: https://github.com/yyuu/pyenv/pull/286#issuecomment-66565475
This was done using:
# Keep our changes for "unmerged, both added"
for i in $(git status --porcelain | grep '^AA ' | cut -d\ -f2); do
git checkout --ours $i
git add $i
done
# "git mv" rbenv files to our name, keeping the current contents.
for i in $(git status --porcelain | grep '^A ' | sed 's/^A //'); do
ours=${i//rbenv/pyenv}
test -f $ours || { echo "Skipping: $i"; continue; }
git mv -f $i $ours
git reset HEAD $ours
done
I've handled the following then manually:
- rbenv.d/exec/gem-rehash.bash
- rbenv.d/exec/gem-rehash/rubygems_plugin.rb
This should allow to merge rbenv in the future using:
git merge rbenv/master -s recursive -X rename-threshold=5%
I am not sure about the rename-threshold, 25% also worked for one file
I've tested.
Conflicts:
.gitignore
.travis.yml
LICENSE
README.md
src/Makefile.in
test/--version.bats
test/commands.bats
test/completions.bats
test/exec.bats
test/global.bats
test/help.bats
test/hooks.bats
test/init.bats
test/local.bats
test/prefix.bats
test/rehash.bats
test/run
test/shell.bats
test/shims.bats
test/test_helper.bash
test/version-file-read.bats
test/version-file-write.bats
test/version-file.bats
test/version-name.bats
test/version-origin.bats
test/version.bats
test/versions.bats
test/whence.bats
test/which.bats
2015-04-15 16:23:26 +02:00
Yamashita Yuu
71c9ff565b
Added note about where to place pyenv init -
in shell configuration file ( #313 )
2015-04-15 22:41:09 +09:00
Yamashita, Yuu
88270e83e8
Merge pull request #355 from mrjefftang/master
...
2.7.9 - Stop '/Library/Python/X.X/site-packages' from being added to sys.path
2015-04-15 22:21:08 +09:00
Yamashita, Yuu
b09681c9fb
Merge pull request #358 from blueyed/fix-src-configure-sed
...
src/configure: fix sed expression
2015-04-15 22:02:12 +09:00
Daniel Hahler
80eef69c9a
src/configure: fix sed expression
...
This has been fixed for rbenv in
https://github.com/sstephenson/rbenv/commit/050f750 .
2015-04-15 05:35:15 +02:00
Jeff Tang
bc025641c2
add patches to stop '/Library/Python/X.X/site-packages' from being added to sys.path
2015-04-14 15:33:37 -04:00
Yamashita Yuu
5dc3ee95fd
Add Jython 2.7 beta4
...
http://fwierzbicki.blogspot.fi/2015/02/jython-27-beta4-released.html
2015-03-31 11:38:50 +09:00
Yamashita, Yuu
4903223f23
Merge pull request #346 from joshfriend/pypy-251-portable
...
add pypy-2.5.1 portable version
2015-03-31 11:37:52 +09:00
Josh Friend
1aea75055a
fix pypy2.5.1 build folder for i686
2015-03-30 22:07:33 -04:00
Yamashita, Yuu
f30085eaf4
Merge pull request #347 from joshfriend/pypy-251-src-fix
...
fix url and checksum for pypy-2.5.1-src
2015-03-31 10:06:12 +09:00
Yamashita, Yuu
43d311ef58
Merge pull request #345 from joshfriend/fix-require-distro
...
Fix require_distro
2015-03-31 09:57:24 +09:00
Yamashita, Yuu
239f4a6b51
Merge pull request #344 from joshfriend/python-3-5-0-a3
...
add python 3.5.0a3
2015-03-31 09:54:30 +09:00
Josh Friend
1463968a3f
fix url and checksum for pypy-2.5.1-src
2015-03-30 16:48:17 -04:00
Josh Friend
97c6a4c932
add pypy-2.5.1 portable version
2015-03-30 15:31:03 -04:00
Josh Friend
5131ef521b
fix required distros for pypy-2.5.x
2015-03-30 13:31:05 -04:00
Josh Friend
1d7ce651b0
fix distro version check
2015-03-30 13:29:09 -04:00
Josh Friend
c335f96eac
add python 3.5.0a3
2015-03-30 11:53:52 -04:00
Yamashita, Yuu
f0eeac63a3
Merge pull request #341 from joshfriend/fix-pypy-2-5-0
...
fix pypy-2.5.0-src build directory
2015-03-26 23:20:04 +09:00
Josh Friend
4ebe18a273
fix pypy-2.5.0-src build directory
2015-03-26 10:14:35 -04:00
Yamashita Yuu
ab2aa6d13b
v20150326
2015-03-26 23:13:55 +09:00
Yamashita, Yuu
431761d125
Merge pull request #340 from joshfriend/pypy-2-5-1
...
Add pypy-2.5.1
2015-03-26 23:05:50 +09:00
Josh Friend
e6e858c33b
Add pypy-2.5.1 ( fixes #338 )
2015-03-26 09:25:04 -04:00
derwolfe
e9aa6cf649
doc: make location to add code to more clear
2015-03-18 21:33:15 +01:00
Yamashita Yuu
4e30b1a5e1
Merge branch 'portable-pypy' ( fixes #326 , #329 )
2015-03-12 01:31:05 +09:00
Yamashita Yuu
2beef3c455
Add pypy-portable binary to some pypy/pypy3 versions
2015-03-12 01:28:21 +09:00
Yamashita Yuu
797975b742
Add sha256sum to pypy-portable archives ( #329 )
2015-03-12 01:22:12 +09:00