Skip to content

Commit

Permalink
Python 3.7 support (#195)
Browse files Browse the repository at this point in the history
* Add support for Python 3.7

* Fix PyPI description rendering

* Upgrade travis environment to Ubuntu 16.04 Xenial

* Update ruamel.yaml to 0.15.x

* Match setup.py version reqs to requirements.txt

* Disable Pylint on Py37

Pylint 2.0+ is needed for Py37, which in turn doesn't support Py27.

* Fix bash IF statement

* More pylint travis modifications
  • Loading branch information
scasagrande authored Feb 7, 2019
1 parent 7195a67 commit cd571bc
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
dist: xenial
sudo: false
language: python
python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
- "3.7"
install:
- "pip install -r requirements.txt"
- "pip install -r dev-requirements.txt"
Expand All @@ -24,8 +26,8 @@ before_script:
- pylint --version
script:
- pytest --cov=instruments
- pylint --py3k instruments
- pylint --disable=I instruments
- if [[ $TRAVIS_PYTHON_VERSION != 3.7 ]]; then pylint --py3k instruments; fi
- if [[ $TRAVIS_PYTHON_VERSION != 3.7 ]]; then pylint --disable=I instruments; fi
after_success:
- coveralls
deploy:
Expand All @@ -35,3 +37,4 @@ deploy:
distributions: "sdist bdist_wheel"
on:
tags: true
condition: "$TRAVIS_PYTHON_VERSION == 3.7"
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ send, one can use the following functions to do so:
Python Version Compatibility
----------------------------

At this time, Python 2.7, 3.4, 3.5, and 3.6 are supported. Should you encounter
At this time, Python 2.7, 3.4, 3.5, 3.6, and 3.7 are supported. Should you encounter
any problems with this library that occur in one version or another, please
do not hesitate to let us know.

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ enum34
python-vxi11>=0.8
pyusb
python-usbtmc
ruamel.yaml~=0.14.12
ruamel.yaml~=0.15.37
13 changes: 9 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Operating System :: OS Independent",
"License :: OSI Approved :: GNU Affero General Public License v3",
"Intended Audience :: Science/Research",
Expand All @@ -38,13 +39,13 @@
"numpy",
"pyserial>=3.3",
"pyvisa>=1.9",
"quantities",
"quantities>=0.12.1",
"enum34",
"future",
"python-vxi11",
"future>=0.15",
"python-vxi11>=0.8",
"python-usbtmc",
"pyusb",
"ruamel.yaml"
"ruamel.yaml~=0.15.37"
]


Expand Down Expand Up @@ -80,6 +81,8 @@ def find_meta(meta):

# MAIN #######################################################################

with open("README.rst", "r") as fh:
long_description = fh.read()

setup(
name=find_meta("title"),
Expand All @@ -94,5 +97,7 @@ def find_meta(meta):
'hypothesis'
],
description=find_meta("description"),
long_description=long_description,
long_description_content_type="text/restructedtext",
classifiers=CLASSIFIERS
)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py34,py35,py36
envlist = py27,py34,py35,py36,py37
[testenv]
deps = -rdev-requirements.txt
commands = pytest

0 comments on commit cd571bc

Please sign in to comment.