github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-12-03 06:39:57 -05:00
Code Issues Projects Releases Packages Wiki Activity
1872 commits 2 branches 187 tags 8.8 MiB
Commit graph

1872 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Daniel Hahler
06c1959e78 Fix test for adding shims in fish 
Commit e2173df4 (for issue #369) did not handle the fish test properly.

This renames it and fixes the assertion.
 2015-04-19 23:53:19 +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
Kevin Burke
0cd078bae6 Merge branch 'master' into use-command 2015-03-31 18:57:44 -07: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
Mislav Marohnić
7ad01b2b48 Document rbenv environment variables 
Closes #699, fixes #666 [ci skip]
 2015-03-13 01:14:24 -07:00
Mislav Marohnić
8c6b764a4c Merge pull request #706 from mhw/realpath-configure-fix 
Fix pattern replacement to allow flags with commas.
 2015-03-12 22:18:23 -07: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
Yamashita Yuu
527334b401 Add pypy-portable-2.5 (#329) 2015-03-12 01:12:47 +09:00
Mark H. Wilkinson
050f750563 Fix pattern replacement to allow flags with commas. 2015-03-11 13:14:52 +00:00
Yamashita Yuu
292813eca3 Install pypy-portable binaries on unsupported platforms (#329) 2015-03-11 21:01:32 +09:00
Yamashita Yuu
d935a2a994 Merge branch 'portable-pypy' of github.com:olliewalsh/pyenv into portable-pypy 2015-03-11 20:42:56 +09:00
Yamashita, Yuu
d9a7117c3b Merge pull request #328 from joshfriend/python-3-5-0-a2 
add python 3.5.0a2
 2015-03-10 00:47:31 +09:00
Josh Friend
6596657004 add python 3.5.0a2 2015-03-09 11:46:01 -04:00
Yamashita Yuu
f48a5b11d7 Import recent changes from rbenv 4d72eefffc 2015-03-07 01:01:32 +09:00
Mislav Marohnić
4d72eefffc Merge branch 'fast-travis' 2015-02-28 12:56:49 +13:00
Mislav Marohnić
b6ac87c220 Faster bats clone 2015-02-27 02:17:31 +13:00
Mislav Marohnić
6b908bf39f Opt into fast Travis CI builds 2015-02-27 02:08:38 +13:00
Mislav Marohnić
f87d8762eb Merge pull request #698 from asymmetric/dead-readme-links 
Remove dead links to History and License from README
 2015-02-27 02:06:16 +13:00
Lorenzo Manacorda
c54fa3731f Remove dead links to Version history and License 
Cfr. #688
 2015-02-26 11:39:31 +01:00
Yamashita Yuu
efe461d2b4 v20150226 (#323) 2015-02-26 11:35:10 +09:00
Yamashita, Yuu
4540967250 Merge pull request #324 from joshfriend/python-3-5-0-a1 
Add python3.5.0a1
 2015-02-26 11:15:22 +09:00
Yamashita, Yuu
d14357f64c Merge pull request #323 from joshfriend/python-3-4-3 
Add python3.4.3
 2015-02-26 11:13:48 +09:00
Josh Friend
d6e1de3e2f add python3.5.0a1 2015-02-25 21:11:02 -05:00