diff options
context:
space:
mode:
authorElvis Pranskevichus <elvis@magic.io>2018-05-01 12:18:48 -0400
committerElvis Pranskevichus <elvis@magic.io>2018-05-01 12:18:48 -0400
commitcc6a62c9dc94a4cd67f4c909699886cfecd16303 (patch)
treed638d6ffb8f06a688ecf8143f4f5127ccc3aaac5
parent4d966a1cf9acb21c9f71f2a630da11e4ac848502 (diff)
downloadimmutables-cc6a62c9dc94a4cd67f4c909699886cfecd16303.tar.gz
immutables-cc6a62c9dc94a4cd67f4c909699886cfecd16303.zip
Unbreak macOS build on Travisv0.5
Diffstat
-rwxr-xr-x.ci/travis-before-install.sh6
-rw-r--r--.travis.yml4
2 files changed, 5 insertions, 5 deletions
diff --git a/.ci/travis-before-install.sh b/.ci/travis-before-install.sh
index fdc9202..13aaf32 100755
--- a/.ci/travis-before-install.sh
+++ b/.ci/travis-before-install.sh
@@ -3,14 +3,14 @@
set -e -x
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
- git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv
- PYENV_ROOT="$HOME/.pyenv"
- PATH="$PYENV_ROOT/bin:$PATH"
+ brew update >/dev/null
+ brew upgrade pyenv
eval "$(pyenv init -)"
if ! (pyenv versions | grep "${PYTHON_VERSION}$"); then
pyenv install ${PYTHON_VERSION}
fi
+
pyenv global ${PYTHON_VERSION}
pyenv rehash
fi
diff --git a/.travis.yml b/.travis.yml
index 60c7eb8..501e0df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,11 +38,11 @@ matrix:
services: [docker]
- os: osx
- env: BUILD=tests,wheels PYTHON_VERSION=3.5.4 PIP_USER=1
+ env: BUILD=tests,wheels PYTHON_VERSION=3.5.5
- os: osx
osx_image: xcode8.3
- env: BUILD=tests,wheels PYTHON_VERSION=3.6.4 PIP_USER=1
+ env: BUILD=tests,wheels PYTHON_VERSION=3.6.5
allow_failures:
- python: "3.7-dev"
generated by cgit
ing the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
generated by cgit