v1.1.2

Merge pull request #921 from scop/micropython
micropython-dev: Set better sys.path
2025-11-08 11:33:49 -05:00 · 2017-07-07 00:40:21 +00:00 · 2017-07-06 10:41:06 +09:00 · 2017-07-05 08:30:49 +03:00 · 2017-06-24 10:06:11 +09:00 · 2017-06-24 00:50:54 +00:00
6 changed files with 19 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /src/Makefile
 /src/*.o
 /bats/
+/default-packages
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,12 @@

 ## Unreleased

+## v1.1.2
+
+* pyenv: Fix incorrect `pyenv --version` output in v1.1.1 (#947)
+
 ## v1.1.1
+
 * python-build: Update links to Portable Pypy 5.8-1 bugfix release, affects pypy2.7-5.8.0 and pypy3.5-5.8.0 definitions (#939)

 ## v1.1.0
--- a/README.md
+++ b/README.md
@@ -210,7 +210,7 @@ easy to fork and contribute any changes back upstream.

    **General warning**: There are some systems where the `BASH_ENV` variable is configured
    to point to `.bashrc`. On such systems you should almost certainly put the abovementioned line
-    `eval "$(pyenv init -)` into `.bash_profile`, and **not** into `.bashrc`. Otherwise you
+    `eval "$(pyenv init -)"` into `.bash_profile`, and **not** into `.bashrc`. Otherwise you
    may observe strange behaviour, such as `pyenv` getting into an infinite loop.
    See [#264](https://github.com/pyenv/pyenv/issues/264) for details.

--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-version="1.1.0"
+version="1.1.2"
 git_revision=""

 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -946,9 +946,10 @@ build_package_micropython() {
  fi
  { cd unix
    "$MAKE" $MAKE_OPTS axtls
-    "$MAKE" $MAKE_OPTS
+    "$MAKE" $MAKE_OPTS CFLAGS_EXTRA="-DMICROPY_PY_SYS_PATH_DEFAULT='\"${PREFIX_PATH}/lib/micropython\"'"
    "$MAKE" install $MAKE_INSTALL_OPTS PREFIX="${PREFIX_PATH}"
-    ( cd "${PREFIX_PATH}/bin" && ln -fs micropython python )
+    ln -fs micropython "${PREFIX_PATH}/bin/python"
+    mkdir -p "${PREFIX_PATH}/lib/micropython"
  }>&4 2>&1
 }

--- a/plugins/python-build/share/python-build/3.6.2rc1
+++ b/plugins/python-build/share/python-build/3.6.2rc1
@@ -0,0 +1,8 @@
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.6.2rc1" "https://www.python.org/ftp/python/3.6.2/Python-3.6.2rc1.tar.xz#16bd96ec3e26365a110d8fd9f582f9123edf9cca04a65c5304c91f524129ca05" ldflags_dirs standard verify_py36 ensurepip
+else
+  install_package "Python-3.6.2rc1" "https://www.python.org/ftp/python/3.6.2/Python-3.6.2rc1.tgz#472ad91e0bb8d66d6dea200f644fcc0591c14b9baa0c22827868069f329f9f9f" ldflags_dirs standard verify_py36 ensurepip
+fi
Author	SHA1	Message	Date
Yamashita, Yuu	8fa1f43856	v1.1.2	2017-07-07 00:40:21 +00:00
Yamashita, Yuu	e93b170fe1	Merge pull request #921 from scop/micropython micropython-dev: Set better sys.path	2017-07-06 10:41:06 +09:00
Ville Skyttä	7add7793cd	micropython-dev: Set better sys.path	2017-07-05 08:30:49 +03:00
Yamashita, Yuu	7467eec9de	Merge pull request #942 from xHeliotrope/master Update README.md typo	2017-06-24 10:06:11 +09:00
Ryan Moore	e83168655c	Update README.md	2017-06-24 00:50:54 +00:00
Yamashita, Yuu	4a707c27de	Merge pull request #674 from jossy/master Add default-packages to .gitignore	2017-06-21 20:22:25 +09:00
Zhiming Wang	734e40d8a5	Add CPython 3.6.2rc1 (#940 )	2017-06-18 19:51:04 -04:00
Josef Hoerandtner	e29dd67ce8	Add default-packages to .gitignore The plugin pyenv-default-packages uses `$(pyenv root)/default-packages` as configuration file. Since this plugin is listed as approved, I assume it makes sense to have the file permanently ignored by Git.	2016-08-16 21:43:55 +02:00