From dd412beda6ff959d54cfeac50bc26cd2b5cad160 Mon Sep 17 00:00:00 2001 From: Mateusz Woda Date: Fri, 20 Aug 2021 14:50:10 +0200 Subject: [PATCH 1/8] Update HISTORY.rst --- HISTORY.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index 8d4ccb578..9e77bf3c0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -10,6 +10,8 @@ Next release - Sensitive language replacement (`#609 `_) +**Bug Fixes:** + 2.12.1 (2021-06-16) ++++++++ From 96917494ed0aac58cf19d126777654cafdd1c9c2 Mon Sep 17 00:00:00 2001 From: Mateusz Woda Date: Mon, 23 Aug 2021 12:58:32 +0200 Subject: [PATCH 2/8] check versions --- .travis/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis/install.sh b/.travis/install.sh index 163b3b952..7b132acfd 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -60,8 +60,12 @@ else export PYENV_ROOT="$PWD/.pyenv" export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" + pyenv versions pyenv install "pypy${PYPY_VERSION}" + pyenv versions + python --version pyenv global "pypy${PYPY_VERSION}" + python --version pip install -U virtualenv pip install --upgrade pip python -m venv $PWD/.venv From f9bb9147e297a827d376458e9aa09940e92839cc Mon Sep 17 00:00:00 2001 From: Mateusz Woda Date: Mon, 23 Aug 2021 13:09:29 +0200 Subject: [PATCH 3/8] check ver --- .travis/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/install.sh b/.travis/install.sh index 7b132acfd..0352c94fd 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -65,6 +65,7 @@ else pyenv versions python --version pyenv global "pypy${PYPY_VERSION}" + pyenv versions python --version pip install -U virtualenv pip install --upgrade pip From 9ddc920b699a031b6bda9966244dd7477e42292b Mon Sep 17 00:00:00 2001 From: Mateusz Woda Date: Mon, 23 Aug 2021 13:20:45 +0200 Subject: [PATCH 4/8] check ver --- .travis/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/install.sh b/.travis/install.sh index 0352c94fd..03f4646cd 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -60,6 +60,7 @@ else export PYENV_ROOT="$PWD/.pyenv" export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" + eval "$(pyenv init --path)" pyenv versions pyenv install "pypy${PYPY_VERSION}" pyenv versions From 44aa4520d9d4f905dbbe03711a6e54331e3a3ae4 Mon Sep 17 00:00:00 2001 From: Mateusz Woda Date: Mon, 23 Aug 2021 13:33:44 +0200 Subject: [PATCH 5/8] fix for ubuntu --- .travis/install.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 03f4646cd..f356f9563 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -18,6 +18,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then if which -s pyenv; then rm -r -f $HOME/.pyenv eval "$(pyenv init -)" + eval "$(pyenv init --path)" fi case "${TOX_ENV}" in @@ -61,13 +62,8 @@ else export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" eval "$(pyenv init --path)" - pyenv versions pyenv install "pypy${PYPY_VERSION}" - pyenv versions - python --version pyenv global "pypy${PYPY_VERSION}" - pyenv versions - python --version pip install -U virtualenv pip install --upgrade pip python -m venv $PWD/.venv @@ -78,3 +74,4 @@ fi source $PWD/.venv/bin/activate pip install -U tox +python --version From 4776f5bcedf6cf4096ef3412702a22347f3d1d08 Mon Sep 17 00:00:00 2001 From: Mateusz Woda Date: Mon, 23 Aug 2021 13:34:36 +0200 Subject: [PATCH 6/8] rollback history --- HISTORY.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 9e77bf3c0..8d4ccb578 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -10,8 +10,6 @@ Next release - Sensitive language replacement (`#609 `_) -**Bug Fixes:** - 2.12.1 (2021-06-16) ++++++++ From 5c7b83d90d14a620a251677c3af46ecf4aa9f43e Mon Sep 17 00:00:00 2001 From: Mateusz Woda Date: Mon, 23 Aug 2021 13:35:29 +0200 Subject: [PATCH 7/8] remove check python version --- .travis/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index f356f9563..ebb6ecf69 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -74,4 +74,3 @@ fi source $PWD/.venv/bin/activate pip install -U tox -python --version From 402d0b01868d42a7985d3b79da8e910460278049 Mon Sep 17 00:00:00 2001 From: Mateusz Woda Date: Mon, 23 Aug 2021 14:05:59 +0200 Subject: [PATCH 8/8] remove old pyenv bootstrap --- .travis/install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index ebb6ecf69..060101107 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -17,7 +17,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then if which -s pyenv; then rm -r -f $HOME/.pyenv - eval "$(pyenv init -)" eval "$(pyenv init --path)" fi @@ -60,7 +59,6 @@ else git clone https://github.com/yyuu/pyenv.git $PWD/.pyenv export PYENV_ROOT="$PWD/.pyenv" export PATH="$PYENV_ROOT/bin:$PATH" - eval "$(pyenv init -)" eval "$(pyenv init --path)" pyenv install "pypy${PYPY_VERSION}" pyenv global "pypy${PYPY_VERSION}"