Josh Friend
5cb9c9af2e
v20150601
9 lat temu
Josh Friend
d6230578ec
Merge pull request #384 from yyuu/pypy-260
Add PyPy 2.6.0
9 lat temu
Josh Friend
62bf3d9b61
Add PyPy 2.5.1 portable
related: #346
9 lat temu
Josh Friend
55e6e7143a
Add PyPy 2.6.0
fixes #383
9 lat temu
Josh Friend
1e78acb701
Add python 3.5.0b2
9 lat temu
Yamashita Yuu
648afe05a9
Import changes from ruby-build v20150519
9 lat temu
Yamashita Yuu
9aee57d965
Fix test for adding shims in fish
9 lat temu
Yamashita Yuu
ed684c239c
Fix inverted condition for `--altinstall` of ensurepip ( #255 )
9 lat temu
Yamashita Yuu
fe934642c5
Skip installint `setuptools` by `ez_setup.py` explicitly ( fixes #381 )
`pip` will install `setuptools` automatically.
9 lat temu
Josh Friend
7c4c1757f7
add 3.5.0 beta1, remove alpha versions
9 lat temu
Yamashita Yuu
1b066598ce
v20150524
9 lat temu
Yamashita Yuu
cc94ad39f1
Add 2.7.10 ( fixes #380 )
9 lat temu
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
9 lat temu
Yamashita, Yuu
46ffb0c8df
Merge pull request #290 from blueyed/version-handle-missing-better
Improve `pyenv version`, if there is one missing
9 lat temu
Yamashita, Yuu
70cce28ba3
Merge pull request #368 from blueyed/pip-rehash-for-versions
pip-rehash: handle versions in commands, like "pip2" and "pip3.4"
9 lat temu
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.
9 lat temu
Yamashita, Yuu
5402ce423b
Merge pull request #376 from thomasjo/tj-fix-bad-anaconda-urls
Fix broken Anaconda3 2.2.0 URLs
9 lat temu
Thomas Johansen
2ea2e7558d
Fix broken Anaconda3-2.2.0 URLs
9 lat temu
Yamashita, Yuu
9d8da866f1
Merge pull request #375 from kuanyili/anaconda
Add Anaconda/Anaconda3 2.2.0 and Miniconda/Miniconda3 3.9.1 definitions
9 lat temu
Kuan-Yi Li
70fa356585
Add Miniconda/Miniconda3 3.9.1 definitions
9 lat temu
Kuan-Yi Li
31fb290de2
Add Anaconda/Anaconda3 2.2.0 definitions
9 lat temu
Josh Friend
e285f2e5b1
use full path when installing a jar
9 lat temu
Josh Friend
1d31529b46
v20150404
9 lat temu
Josh Friend
6f40dae3d7
Merge pull request #371 from yyuu/fix-py3.1-pip
Fix Pip install on python 3.1.x
9 lat temu
Josh Friend
d2794f54e5
add a few missing python 3.1.x releases
9 lat temu
Josh Friend
bc03106cee
pin pip version to 1.5.6 for python 3.1 ( fixes #351 )
9 lat temu
Yamashita, Yuu
bf93b90282
Merge pull request #370 from joshfriend/jython-2-7-0
Add jython 2.7.0
9 lat temu
Josh Friend
7b8bd11416
fix jython pip and add warning about JAVA_HOME for osx/windows users
9 lat temu
Josh Friend
f623231734
Add jython 2.7.0
9 lat temu
Daniel Hahler
481198d255
pip-rehash: handle versions in commands, like "pip2" and "pip3.4"
Fixes https://github.com/yyuu/pyenv/issues/367
9 lat temu
Yamashita, Yuu
50d5de4731
Merge pull request #364 from joshfriend/python-3-5-0-a4
Add Python-3.5.0a4
9 lat temu
Josh Friend
15977c852d
add python3.5.0a4
9 lat temu
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 .
9 lat temu
Yamashita, Yuu
be037932ca
Merge pull request #360 from yyuu/merge-rbenv
Merge rbenv to have a common ancestor for future merges
9 lat temu
Yamashita, Yuu
af95960960
Merge pull request #362 from n8henrie/master
Details on multiple Python2 and Python3 versions.
9 lat temu
Nathan Henrie
17c153b1c1
Details on multiple Python2 and Python3 versions.
Add detail regarding activating multiple Python2 and Python3 versions simultaneously.
9 lat temu
Daniel Hahler
065f5578b1
Merge rbenv parent repository
This merges
4d72eefffc
to build a common ancestor for future merges.
This is branched off f48a5b11d709ec616f766864b8e0ab894cb30962, 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
9 lat temu
Yamashita Yuu
71c9ff565b
Added note about where to place `pyenv init -` in shell configuration file ( #313 )
9 lat temu
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
9 lat temu
Yamashita, Yuu
b09681c9fb
Merge pull request #358 from blueyed/fix-src-configure-sed
src/configure: fix sed expression
9 lat temu
Daniel Hahler
80eef69c9a
src/configure: fix sed expression
This has been fixed for rbenv in
https://github.com/sstephenson/rbenv/commit/050f750 .
9 lat temu
Jeff Tang
bc025641c2
add patches to stop '/Library/Python/X.X/site-packages' from being added to sys.path
9 lat temu
Yamashita Yuu
5dc3ee95fd
Add Jython 2.7 beta4
http://fwierzbicki.blogspot.fi/2015/02/jython-27-beta4-released.html
9 lat temu
Yamashita, Yuu
4903223f23
Merge pull request #346 from joshfriend/pypy-251-portable
add pypy-2.5.1 portable version
9 lat temu
Josh Friend
1aea75055a
fix pypy2.5.1 build folder for i686
9 lat temu
Yamashita, Yuu
f30085eaf4
Merge pull request #347 from joshfriend/pypy-251-src-fix
fix url and checksum for pypy-2.5.1-src
9 lat temu
Yamashita, Yuu
43d311ef58
Merge pull request #345 from joshfriend/fix-require-distro
Fix require_distro
9 lat temu
Yamashita, Yuu
239f4a6b51
Merge pull request #344 from joshfriend/python-3-5-0-a3
add python 3.5.0a3
9 lat temu
Josh Friend
1463968a3f
fix url and checksum for pypy-2.5.1-src
9 lat temu
Josh Friend
97c6a4c932
add pypy-2.5.1 portable version
9 lat temu