From ff666ab4893acd3370db8329278c3cb1ca5552fd Mon Sep 17 00:00:00 2001 From: menduo Date: Mon, 17 Apr 2017 11:59:53 +0800 Subject: [PATCH 1/2] replace github.com/yyuu with github.com/pyenv --- CHANGELOG.md | 6 +++--- COMMANDS.md | 4 ++-- plugins/python-build/share/python-build/3.0.1 | 2 +- plugins/python-build/share/python-build/jython-2.5-dev | 2 +- plugins/python-build/share/python-build/jython-2.5.0 | 4 ++-- plugins/python-build/share/python-build/jython-2.5.1 | 4 ++-- plugins/python-build/share/python-build/jython-2.5.2 | 2 +- plugins/python-build/share/python-build/jython-2.5.3 | 2 +- plugins/python-build/share/python-build/jython-2.5.4-rc1 | 2 +- plugins/python-build/share/python-build/jython-dev | 2 +- pyenv.d/rehash/conda.bash | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6442a0e6..37579619 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ ## 1.0.9 -* pyenv: Migrate project site from https://github.com/yyuu/pyenv to https://github.com/pyenv/pyenv +* pyenv: Migrate project site from https://github.com/pyenv/pyenv to https://github.com/pyenv/pyenv * python-build: Add PyPy2 5.7.0 (#872, #868) * python-build: Add PyPy3 5.7.0-beta (#871, #869) * python-build: Add CPython 3.6.1 (#873) @@ -274,7 +274,7 @@ #### 20141211 -* pyenv: Add built-in `pip-rehash` feature. You don't need to install [pyenv-pip-rehash](https://github.com/yyuu/pyenv-pip-rehash) anymore. +* pyenv: Add built-in `pip-rehash` feature. You don't need to install [pyenv-pip-rehash](https://github.com/pyenv/pyenv-pip-rehash) anymore. * python-build: Add new CPython release; 2.7.9 (#284) * python-build: Add new PyPy releases; pypy3-2.4.0, pypy3-2.4.0-src (#277) * python-build: Add build definitions of PyPy nightly build @@ -440,7 +440,7 @@ * python-build: Activate friendly CPython during build if the one is not activated (8fa6b4a1847851919ad7857c6c42ed809a4d277b) * python-build: Fix broken install.sh * python-build: Import recent changes from ruby-build v20131225.1 -* version-ext-compat: Removed from default plugin. Please use [pyenv-version-ext](https://github.com/yyuu/pyenv-version-ext) instead. +* version-ext-compat: Removed from default plugin. Please use [pyenv-version-ext](https://github.com/pyenv/pyenv-version-ext) instead. #### 0.4.0-20131217 diff --git a/COMMANDS.md b/COMMANDS.md index fb396d7f..eafcd668 100644 --- a/COMMANDS.md +++ b/COMMANDS.md @@ -1,7 +1,7 @@ # Command Reference Like `git`, the `pyenv` command delegates to subcommands based on its -first argument. +first argument. The most common subcommands are: @@ -185,7 +185,7 @@ or, if you prefer 3.3.3 over 2.7.6, ## `pyenv install` -Install a Python version (using [`python-build`](https://github.com/yyuu/pyenv/tree/master/plugins/python-build)). +Install a Python version (using [`python-build`](https://github.com/pyenv/pyenv/tree/master/plugins/python-build)). Usage: pyenv install [-f] [-kvp] pyenv install [-f] [-kvp] diff --git a/plugins/python-build/share/python-build/3.0.1 b/plugins/python-build/share/python-build/3.0.1 index 1344a94c..2549eea9 100644 --- a/plugins/python-build/share/python-build/3.0.1 +++ b/plugins/python-build/share/python-build/3.0.1 @@ -3,7 +3,7 @@ install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k. install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "Python-3.0.1" "https://www.python.org/ftp/python/3.0.1/Python-3.0.1.tgz#7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de" ldflags_dirs standard verify_py30 if [[ "Darwin" == "$(uname -s)" ]]; then - # https://github.com/yyuu/pyenv/issues/456 + # https://github.com/pyenv/pyenv/issues/456 { echo colorize 1 "WARNING" echo ": pyenv cannot install setuptools-1.4.2 to CPython 3.0.1 on OS X." diff --git a/plugins/python-build/share/python-build/jython-2.5-dev b/plugins/python-build/share/python-build/jython-2.5-dev index e7b417aa..9bebdee2 100644 --- a/plugins/python-build/share/python-build/jython-2.5-dev +++ b/plugins/python-build/share/python-build/jython-2.5-dev @@ -2,5 +2,5 @@ require_java install_hg "jython-2.5-dev" "https://hg.python.org/jython" "2.5" jython_builder install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads -# * https://github.com/yyuu/pyenv/issues/15 +# * https://github.com/pyenv/pyenv/issues/15 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python diff --git a/plugins/python-build/share/python-build/jython-2.5.0 b/plugins/python-build/share/python-build/jython-2.5.0 index 55b87b71..51ddf4bb 100644 --- a/plugins/python-build/share/python-build/jython-2.5.0 +++ b/plugins/python-build/share/python-build/jython-2.5.0 @@ -1,9 +1,9 @@ require_java install_jar "jython-2.5.0" "https://downloads.sourceforge.net/project/jython/jython/2.5.0/jython_installer-2.5.0.jar#e3d8209ef9eb143df8101a5da6b3482cf457084e3a6247031fd510d71c13ab98" jython # distribute (>= 0.33) does not support Jython prior to 2.5.2 -# * https://github.com/yyuu/pyenv/issues/15 +# * https://github.com/pyenv/pyenv/issues/15 # * https://bitbucket.org/tarek/distribute/issue/367/importing-setuptoolssandbox-fails-on install_package "distribute-0.6.32" "https://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz#8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads -# * https://github.com/yyuu/pyenv/issues/15 +# * https://github.com/pyenv/pyenv/issues/15 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python diff --git a/plugins/python-build/share/python-build/jython-2.5.1 b/plugins/python-build/share/python-build/jython-2.5.1 index 01ab692c..a7e37e73 100644 --- a/plugins/python-build/share/python-build/jython-2.5.1 +++ b/plugins/python-build/share/python-build/jython-2.5.1 @@ -1,9 +1,9 @@ require_java install_jar "jython-2.5.1" "https://downloads.sourceforge.net/project/jython/jython/2.5.1/jython_installer-2.5.1.jar#229dfd1ed9728aa7e00c71f111d08fa777a4edcd03383779c74216765098f9c5" jython # distribute (>= 0.33) does not support Jython prior to 2.5.2 -# * https://github.com/yyuu/pyenv/issues/15 +# * https://github.com/pyenv/pyenv/issues/15 # * https://bitbucket.org/tarek/distribute/issue/367/importing-setuptoolssandbox-fails-on install_package "distribute-0.6.32" "https://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz#8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads -# * https://github.com/yyuu/pyenv/issues/15 +# * https://github.com/pyenv/pyenv/issues/15 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python diff --git a/plugins/python-build/share/python-build/jython-2.5.2 b/plugins/python-build/share/python-build/jython-2.5.2 index e76cceb1..aff5f647 100644 --- a/plugins/python-build/share/python-build/jython-2.5.2 +++ b/plugins/python-build/share/python-build/jython-2.5.2 @@ -2,5 +2,5 @@ require_java install_jar "jython-2.5.2" "https://downloads.sourceforge.net/project/jython/jython/2.5.2/jython_installer-2.5.2.jar#1b7168b961e31ddd89012a36cde611c340dadfd8b60b81c4248b026730ee2f29" jython install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads -# * https://github.com/yyuu/pyenv/issues/15 +# * https://github.com/pyenv/pyenv/issues/15 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python diff --git a/plugins/python-build/share/python-build/jython-2.5.3 b/plugins/python-build/share/python-build/jython-2.5.3 index 1b4d9ab3..da009b7d 100644 --- a/plugins/python-build/share/python-build/jython-2.5.3 +++ b/plugins/python-build/share/python-build/jython-2.5.3 @@ -2,5 +2,5 @@ require_java install_jar "jython-2.5.3" "https://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.3/jython-installer-2.5.3.jar#05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e" jython install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads -# * https://github.com/yyuu/pyenv/issues/15 +# * https://github.com/pyenv/pyenv/issues/15 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python diff --git a/plugins/python-build/share/python-build/jython-2.5.4-rc1 b/plugins/python-build/share/python-build/jython-2.5.4-rc1 index 3db36095..714c42dd 100644 --- a/plugins/python-build/share/python-build/jython-2.5.4-rc1 +++ b/plugins/python-build/share/python-build/jython-2.5.4-rc1 @@ -2,5 +2,5 @@ require_java install_jar "jython-2.5.4-rc1" "https://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.4-rc1/jython-installer-2.5.4-rc1.jar#2fa6821ef506804ca77f87631a21878c11d743f8a7fa9ed26e55dfd7696204d1" jython install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads -# * https://github.com/yyuu/pyenv/issues/15 +# * https://github.com/pyenv/pyenv/issues/15 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python diff --git a/plugins/python-build/share/python-build/jython-dev b/plugins/python-build/share/python-build/jython-dev index 7b58692e..7dbcb190 100644 --- a/plugins/python-build/share/python-build/jython-dev +++ b/plugins/python-build/share/python-build/jython-dev @@ -2,5 +2,5 @@ require_java unrequire_python27 install_hg "jython-dev" "https://hg.python.org/jython" "default" jython_builder ez_setup # pip (>= 1.3) does not work properly since it uses HTTPS for downloads -# * https://github.com/yyuu/pyenv/issues/15 +# * https://github.com/pyenv/pyenv/issues/15 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python diff --git a/pyenv.d/rehash/conda.bash b/pyenv.d/rehash/conda.bash index a7ecf4ea..9b22dfb0 100644 --- a/pyenv.d/rehash/conda.bash +++ b/pyenv.d/rehash/conda.bash @@ -20,7 +20,7 @@ done eval "conda_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}" # override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash` -# https://github.com/yyuu/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash +# https://github.com/pyenv/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash make_shims() { local file shim for file do From f5e49fe6fa999dc2830d5357f67a2bf3d90a4cfa Mon Sep 17 00:00:00 2001 From: menduo Date: Tue, 18 Apr 2017 10:16:37 +0800 Subject: [PATCH 2/2] changelog: correct doc for version 1.0.9 --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37579619..d46beb4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ ## 1.0.9 -* pyenv: Migrate project site from https://github.com/pyenv/pyenv to https://github.com/pyenv/pyenv +* pyenv: Migrate project site from https://github.com/yyuu/pyenv to https://github.com/pyenv/pyenv * python-build: Add PyPy2 5.7.0 (#872, #868) * python-build: Add PyPy3 5.7.0-beta (#871, #869) * python-build: Add CPython 3.6.1 (#873) @@ -157,12 +157,12 @@ * pyenv: Merge recent changes from rbenv as of 2015-12-14 (#504) * python-build: Add a `OPENSSL_NO_SSL3` patch for CPython 2.6, 2.7, 3.0, 3.1, 3.2 and 3.3 series (#507, #511) -* python-build: Stopped using mirror at yyuu.github.io for CPython since http://www.python.org is on fast.ly +* python-build: Stopped using mirror at pyenv.github.io for CPython since http://www.python.org is on fast.ly ### 20151210 * pyenv: Add a default hook for Anaconda to look for original `$PATH` (#491) -* pyenv: Skip virtualenv aliases on `pyenv versions --skip-aliases` (yyuu/pyenv-virtualenv#126) +* pyenv: Skip virtualenv aliases on `pyenv versions --skip-aliases` (pyenv/pyenv-virtualenv#126) * python-build: Add CPython 2.7.11, 3.5.1 (#494, #498) * python-build: Update OpenSSL to 1.0.1q (#496) * python-build: Adding SSL patch to build 2.7.3 on Debian (#495) @@ -386,7 +386,7 @@ * python-build: Do not exit with errors even if some of modules are absent (#131) * python-build: MacOSX was misspelled as MaxOSX in `anaconda_architecture` (#136) * python-build: Use default `cc` as the C Compiler to build CPython (#148, #150) -* python-build: Display value from `pypy_architecture` and `anaconda_architecture` on errors (yyuu/pyenv-virtualenv#18) +* python-build: Display value from `pypy_architecture` and `anaconda_architecture` on errors (pyenv/pyenv-virtualenv#18) * python-build: Remove old development version; 2.6-dev * python-build: Update default setuptools version (3.3 -> 3.4.1)