summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-14 07:53:47 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-14 07:53:47 -0400
commitdbbd0a974fe22a98ae6d85e7c78a25ee397d856e (patch)
tree5ea0222016cc94f78ce78736d588ab8470add383
parente9ae673b3999344a5aaa121bfe6925d172b61c13 (diff)
parent2a617ce83e956ce26659976a29e458496e9db7eb (diff)
downloadpyopenssl-dbbd0a974fe22a98ae6d85e7c78a25ee397d856e.tar.gz
Merge pull request #260 from hynek/fix-fsencoding
Fix Travis CI
-rw-r--r--.travis.yml3
-rw-r--r--tox.ini2
2 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 0354895..e49fbf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
sudo: false
language: python
+env:
+ global:
+ - LC_ALL=en_US.UTF-8
matrix:
include:
diff --git a/tox.ini b/tox.ini
index c87f166..37041a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,8 @@
envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest
[testenv]
+passenv =
+ LC_ALL
deps =
setuptools>=7.0 # older setuptools pollute CWD with egg files of dependencies
coverage