diff --git a/CHANGELOG.md b/CHANGELOG.md index 146b8a2c..8710a5fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -315,7 +315,7 @@ * python-build: Fix build of Tkinter with Tcl/Tk 8.6 (#131) * python-build: Fix build problem with Readline 6.3 (#126, #131, #149, #152) * python-build: Do not exit with errors even if some of modules are absent (#131) -* python-build: MacOSX was mispelled as MaxOSX in `anaconda_architecture` (#136) +* 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: Remove old development version; 2.6-dev diff --git a/plugins/python-build/README.md b/plugins/python-build/README.md index 5a00ab82..c13c51c9 100644 --- a/plugins/python-build/README.md +++ b/plugins/python-build/README.md @@ -175,7 +175,7 @@ definition. (All bundled definitions include checksums.) python-build will first attempt to download package files from a mirror hosted on GitHub Pages. If a package is not available on the mirror, if the mirror is down, or if the download is corrupt, python-build will fall back to the -official URL specified in the defintion file. +official URL specified in the definition file. You can point python-build to another mirror by specifying the `PYTHON_BUILD_MIRROR_URL` environment variable--useful if you'd like to run your diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install index ae937903..651d5b31 100755 --- a/plugins/python-build/bin/pyenv-install +++ b/plugins/python-build/bin/pyenv-install @@ -191,7 +191,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then # unsatisfied local .python-version file can cause the installer to # fail.) for version_info in "${VERSION_NAME%-dev}" "${VERSION_NAME%.*}" "${VERSION_NAME%%.*}"; do - # Anaconda's `curl` doesn't work on platfrom where `/etc/pki/tls/certs/ca-bundle.crt` isn't available (e.g. Debian) + # Anaconda's `curl` doesn't work on platform where `/etc/pki/tls/certs/ca-bundle.crt` isn't available (e.g. Debian) for version in $(pyenv-whence "python${version_info}" 2>/dev/null || true); do if [[ "${version}" != "anaconda"* ]] && [[ "${version}" != "miniconda"* ]]; then PYENV_BOOTSTRAP_VERSION="${version}" diff --git a/plugins/python-build/share/python-build/pypy-1.7 b/plugins/python-build/share/python-build/pypy-1.7 index 3f992c43..a951675c 100644 --- a/plugins/python-build/share/python-build/pypy-1.7 +++ b/plugins/python-build/share/python-build/pypy-1.7 @@ -16,7 +16,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-1.7-dev' to build from soruce." + echo "try 'pypy-1.7-dev' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-1.8 b/plugins/python-build/share/python-build/pypy-1.8 index ef1a4b38..5e28f8e3 100644 --- a/plugins/python-build/share/python-build/pypy-1.8 +++ b/plugins/python-build/share/python-build/pypy-1.8 @@ -16,7 +16,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-1.8-dev' to build from soruce." + echo "try 'pypy-1.8-dev' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-1.9 b/plugins/python-build/share/python-build/pypy-1.9 index 5bd0149e..11aa8db2 100644 --- a/plugins/python-build/share/python-build/pypy-1.9 +++ b/plugins/python-build/share/python-build/pypy-1.9 @@ -16,7 +16,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-1.9-dev' to build from soruce." + echo "try 'pypy-1.9-dev' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.0 b/plugins/python-build/share/python-build/pypy-2.0 index acbff258..02a623b2 100644 --- a/plugins/python-build/share/python-build/pypy-2.0 +++ b/plugins/python-build/share/python-build/pypy-2.0 @@ -26,7 +26,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.0-src' to build from soruce." + echo "try 'pypy-2.0-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.0.1 b/plugins/python-build/share/python-build/pypy-2.0.1 index d4285d40..ee9e3e70 100644 --- a/plugins/python-build/share/python-build/pypy-2.0.1 +++ b/plugins/python-build/share/python-build/pypy-2.0.1 @@ -18,7 +18,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.0.1-src' to build from soruce." + echo "try 'pypy-2.0.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.0.2 b/plugins/python-build/share/python-build/pypy-2.0.2 index 59089582..b665d6de 100644 --- a/plugins/python-build/share/python-build/pypy-2.0.2 +++ b/plugins/python-build/share/python-build/pypy-2.0.2 @@ -18,7 +18,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.0.2-src' to build from soruce." + echo "try 'pypy-2.0.2-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.1 b/plugins/python-build/share/python-build/pypy-2.1 index fdaa6fe8..f1ed28fa 100644 --- a/plugins/python-build/share/python-build/pypy-2.1 +++ b/plugins/python-build/share/python-build/pypy-2.1 @@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.1-src' to build from soruce." + echo "try 'pypy-2.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.2 b/plugins/python-build/share/python-build/pypy-2.2 index 2c68efad..fd624a07 100644 --- a/plugins/python-build/share/python-build/pypy-2.2 +++ b/plugins/python-build/share/python-build/pypy-2.2 @@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.2-src' to build from soruce." + echo "try 'pypy-2.2-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.2.1 b/plugins/python-build/share/python-build/pypy-2.2.1 index 8880aaf7..6ae86521 100644 --- a/plugins/python-build/share/python-build/pypy-2.2.1 +++ b/plugins/python-build/share/python-build/pypy-2.2.1 @@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.2.1-src' to build from soruce." + echo "try 'pypy-2.2.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.3 b/plugins/python-build/share/python-build/pypy-2.3 index a4487487..28f3dfc5 100644 --- a/plugins/python-build/share/python-build/pypy-2.3 +++ b/plugins/python-build/share/python-build/pypy-2.3 @@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.3-src' to build from soruce." + echo "try 'pypy-2.3-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.3.1 b/plugins/python-build/share/python-build/pypy-2.3.1 index e60dede2..c592e248 100644 --- a/plugins/python-build/share/python-build/pypy-2.3.1 +++ b/plugins/python-build/share/python-build/pypy-2.3.1 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.3.1-src' to build from soruce." + echo "try 'pypy-2.3.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.4-beta1 b/plugins/python-build/share/python-build/pypy-2.4-beta1 index f7352bcd..5c6deca0 100644 --- a/plugins/python-build/share/python-build/pypy-2.4-beta1 +++ b/plugins/python-build/share/python-build/pypy-2.4-beta1 @@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.4-beta1-src' to build from soruce." + echo "try 'pypy-2.4-beta1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.4.0 b/plugins/python-build/share/python-build/pypy-2.4.0 index cc6bb69c..2055c04a 100644 --- a/plugins/python-build/share/python-build/pypy-2.4.0 +++ b/plugins/python-build/share/python-build/pypy-2.4.0 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.4.0-src' to build from soruce." + echo "try 'pypy-2.4.0-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.5.0 b/plugins/python-build/share/python-build/pypy-2.5.0 index c88ace02..7d7d62a6 100644 --- a/plugins/python-build/share/python-build/pypy-2.5.0 +++ b/plugins/python-build/share/python-build/pypy-2.5.0 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.5.0-src' to build from soruce." + echo "try 'pypy-2.5.0-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.5.1 b/plugins/python-build/share/python-build/pypy-2.5.1 index 7bfdf4f9..06bf7607 100644 --- a/plugins/python-build/share/python-build/pypy-2.5.1 +++ b/plugins/python-build/share/python-build/pypy-2.5.1 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.5.1-src' to build from soruce." + echo "try 'pypy-2.5.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.6.0 b/plugins/python-build/share/python-build/pypy-2.6.0 index b1204cd7..ceed07cb 100644 --- a/plugins/python-build/share/python-build/pypy-2.6.0 +++ b/plugins/python-build/share/python-build/pypy-2.6.0 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.6.0-src' to build from soruce." + echo "try 'pypy-2.6.0-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-2.6.1 b/plugins/python-build/share/python-build/pypy-2.6.1 index d6d9847c..6dbeab1b 100644 --- a/plugins/python-build/share/python-build/pypy-2.6.1 +++ b/plugins/python-build/share/python-build/pypy-2.6.1 @@ -39,7 +39,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.6.1-src' to build from soruce." + echo "try 'pypy-2.6.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-4.0.0 b/plugins/python-build/share/python-build/pypy-4.0.0 index 330dd94a..62f497af 100644 --- a/plugins/python-build/share/python-build/pypy-4.0.0 +++ b/plugins/python-build/share/python-build/pypy-4.0.0 @@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-4.0.0-src' to build from soruce." + echo "try 'pypy-4.0.0-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-4.0.1 b/plugins/python-build/share/python-build/pypy-4.0.1 index 6f119c85..388d80b9 100644 --- a/plugins/python-build/share/python-build/pypy-4.0.1 +++ b/plugins/python-build/share/python-build/pypy-4.0.1 @@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-4.0.1-src' to build from soruce." + echo "try 'pypy-4.0.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-5.0.0 b/plugins/python-build/share/python-build/pypy-5.0.0 index 4d17cfbb..fddb41f8 100644 --- a/plugins/python-build/share/python-build/pypy-5.0.0 +++ b/plugins/python-build/share/python-build/pypy-5.0.0 @@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-5.0.0-src' to build from soruce." + echo "try 'pypy-5.0.0-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-5.0.1 b/plugins/python-build/share/python-build/pypy-5.0.1 index 618b68ea..ba9d0201 100644 --- a/plugins/python-build/share/python-build/pypy-5.0.1 +++ b/plugins/python-build/share/python-build/pypy-5.0.1 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-5.0.1-src' to build from soruce." + echo "try 'pypy-5.0.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-5.1 b/plugins/python-build/share/python-build/pypy-5.1 index e259e442..2e20edd6 100644 --- a/plugins/python-build/share/python-build/pypy-5.1 +++ b/plugins/python-build/share/python-build/pypy-5.1 @@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-5.1.0-src' to build from soruce." + echo "try 'pypy-5.1.0-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy-5.1.1 b/plugins/python-build/share/python-build/pypy-5.1.1 index ab1ab043..74c45fd1 100644 --- a/plugins/python-build/share/python-build/pypy-5.1.1 +++ b/plugins/python-build/share/python-build/pypy-5.1.1 @@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-5.1.1-src' to build from soruce." + echo "try 'pypy-5.1.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy2-5.3 b/plugins/python-build/share/python-build/pypy2-5.3 index 66a38b7d..5b668e2f 100644 --- a/plugins/python-build/share/python-build/pypy2-5.3 +++ b/plugins/python-build/share/python-build/pypy2-5.3 @@ -6,7 +6,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy2-5.3-src' to build from soruce." + echo "try 'pypy2-5.3-src' to build from source." echo } >&2 exit 1 @@ -31,7 +31,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy2-5.3-src' to build from soruce." + echo "try 'pypy2-5.3-src' to build from source." echo } >&2 exit 1 @@ -48,7 +48,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-5.3-src' to build from soruce." + echo "try 'pypy-5.3-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy2-5.3.1 b/plugins/python-build/share/python-build/pypy2-5.3.1 index c8a49a99..bd826ffe 100644 --- a/plugins/python-build/share/python-build/pypy2-5.3.1 +++ b/plugins/python-build/share/python-build/pypy2-5.3.1 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy2-5.3.1-src' to build from soruce." + echo "try 'pypy2-5.3.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy2-5.4 b/plugins/python-build/share/python-build/pypy2-5.4 index e6604e49..1801b8f1 100644 --- a/plugins/python-build/share/python-build/pypy2-5.4 +++ b/plugins/python-build/share/python-build/pypy2-5.4 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy2-5.4-src' to build from soruce." + echo "try 'pypy2-5.4-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy3-2.3.1 b/plugins/python-build/share/python-build/pypy3-2.3.1 index a0fca227..ed31268b 100644 --- a/plugins/python-build/share/python-build/pypy3-2.3.1 +++ b/plugins/python-build/share/python-build/pypy3-2.3.1 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy3-2.3.1-src' to build from soruce." + echo "try 'pypy3-2.3.1-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy3-2.4.0 b/plugins/python-build/share/python-build/pypy3-2.4.0 index 23ee58a6..ef57afcb 100644 --- a/plugins/python-build/share/python-build/pypy3-2.4.0 +++ b/plugins/python-build/share/python-build/pypy3-2.4.0 @@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy3-2.4.0-src' to build from soruce." + echo "try 'pypy3-2.4.0-src' to build from source." echo } >&2 exit 1 diff --git a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1 b/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1 index a7c5a2a4..0bab7f06 100644 --- a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1 +++ b/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1 @@ -32,7 +32,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in { echo colorize 1 "ERROR" echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy3.3-5.2-alpha1-src' to build from soruce." + echo "try 'pypy3.3-5.2-alpha1-src' to build from source." echo } >&2 exit 1 diff --git a/test/version-name.bats b/test/version-name.bats index d0990473..97604f82 100644 --- a/test/version-name.bats +++ b/test/version-name.bats @@ -17,7 +17,7 @@ setup() { assert_success "system" } -@test "system version is not checked for existance" { +@test "system version is not checked for existence" { PYENV_VERSION=system run pyenv-version-name assert_success "system" }