Skip to content

Commit

Permalink
Merge pull request #380 from Carreau/bump-testing
Browse files Browse the repository at this point in the history
update python version testing
  • Loading branch information
Carreau authored May 18, 2018
2 parents 2fae25b + d62626e commit 01fc51b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: python
python:
- "nightly"
- '3.6-dev'
- "3.7-dev"
- 3.6
- 3.5
- 3.4
- 3.3
- 2.7
sudo: false
install:
Expand Down
4 changes: 2 additions & 2 deletions jupyter_client/tests/test_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def test_send(self):

# buffers must be contiguous
buf = memoryview(os.urandom(16))
if sys.version_info >= (3,3):
if sys.version_info >= (3,4):
with self.assertRaises(ValueError):
self.session.send(A, msg, ident=b'foo', buffers=[buf[::2]])

Expand Down Expand Up @@ -339,7 +339,7 @@ def test_send_raw(self):
A.close()
B.close()
ctx.term()

def test_clone(self):
s = self.session
s._add_digest('initial')
Expand Down
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import sys

v = sys.version_info
if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,3)):
error = "ERROR: %s requires Python version 2.7 or 3.3 or above." % name
if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,4)):
error = "ERROR: %s requires Python version 2.7 or 3.4 or above." % name
print(error, file=sys.stderr)
sys.exit(1)

Expand Down Expand Up @@ -92,10 +92,9 @@ def run(self):
'entrypoints',
'tornado>=4.1',
],
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
extras_require = {
'test': ['ipykernel', 'ipython', 'mock'],
'test:python_version == "3.3"': ['pytest>=3,<3.3.0'],
'test:(python_version >= "3.4" or python_version == "2.7")': ['pytest'],
},
cmdclass = {
Expand Down

0 comments on commit 01fc51b

Please sign in to comment.