Fixed travis pypy versioning, make shure using pip 10 for test, fixed…

… tests for python3
amey-sam · Jun 4, 2018 · 824cecd · 824cecd
1 parent 9b6fd9a
commit 824cecd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,20 +3,19 @@ language: python
 python:
 - "2.7"
 #- "3.3"
-#- "3.5"
-- pypy-5.3.1
+- "3.5"
+- pypy2.7-5.10
 env:
   global:
   - MAILGUN_API_KEY=testtesttest
   - secure: QWNGqrTcNUIdtpBKz1KMsx54SZ5OkQ1eK8SR4iJag4I3UXhT7MIwtbBrWyIEQvoC2in23gp5lPPiG842lPgKebOz+8GyJHYaE7SKPjPdpRfxPJSoDrJagArKNcsZrcZJkAr9jIpqV6Ap7p0TzzOWXsqYDbmLWxgrJOLHTLHi9QZc71vjP4wRhRBtz24xcUgSsRRUrM56FrxSy27zoem4AeJwRRVB52d1HwDbcHtbJ/3taVHFd4WLbdUIbwyOvXX3RGqVv2TxX9YoH+1S18mSoKy+OWulOQyrHc8pjPkz+cNyCYXE2Pu3m97e5c+NzFLsnfqYyKwROM49qGOvXbY0tziVYUAvgoJ1P+fsShKH5WKhv9J917R5QLf12iWKPI3/apBhXb5yGoFOerSxMUgJz4hSuKGTbg7nJ2hWJZVop7+c2LiSbtahghhmjJwlVzNSzTb6X6UayEgVlaqSF7wyq5pJmMXZ7fDxoooTyu4iDjRwYzxH1OrUWYz2Q9pHK7YAf9dHOgnrqaI6f+HQ9qt9auG9pGQ7Ep7tQVcikvWLZEgyqYLClagazqwoJImPrLrip3JVnb4lTudiwn2jKHYVgSjfEJn28aBf9ArtBpIvtnl5Rpe7fHrfeape5zUZlxC0lZ2sYWkoef/KooYWKk1iXOPA59RmswE6G8OZ+KmrV9s=
 install:
 - pip install -U pip
-- pip install -U setuptools
 - pip install -r requirements.txt
 - pip install -e .
 - pip install codeclimate-test-reporter
 - pip install coverage pylint mock diff_cover coveralls
-script: nosetests -v --with-coverage --cover-tests --cover-package=flask_mailgun
+script: python -m nose -v --with-coverage --cover-tests --cover-package=flask_mailgun
 after_success:
 - coveralls
 - codeclimate-test-reporter

diff --git a/tests/fixtures/__init__.py b/tests/fixtures/__init__.py
@@ -11,6 +11,6 @@ def get_attachment():
     filename = "test_attachment.txt"
     fixture_dir = os.path.dirname(__file__)
     f_name = os.path.join(fixture_dir, filename)
-    file_stream = open(f_name, "r")
+    file_stream = open(f_name, "rb")
     return (filename, file_stream)