Skip to content

Commit bfe76c9

Browse files
Merge pull request #542 from mattwthompson/add-37
Add Python 3.7, Drop Python 3.5 and coveralls, and unpin MDTraj version
2 parents 761fa1c + d234dd8 commit bfe76c9

File tree

6 files changed

+11
-29
lines changed

6 files changed

+11
-29
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ sudo: false
55
matrix:
66
include:
77
- { os: linux, env: PYTHON_VERSION=2.7 }
8-
- { os: linux, env: PYTHON_VERSION=3.5 }
98
- { os: linux, env: PYTHON_VERSION=3.6 }
9+
- { os: linux, env: PYTHON_VERSION=3.7 }
1010
- { os: osx, env: PYTHON_VERSION=2.7 }
11-
- { os: osx, env: PYTHON_VERSION=3.5 }
1211
- { os: osx, env: PYTHON_VERSION=3.6 }
12+
- { os: osx, env: PYTHON_VERSION=3.7 }
1313

1414
env:
1515
global:
@@ -33,6 +33,5 @@ script:
3333
- python -m pytest -v --cov=mbuild --cov-report= --pyargs mbuild
3434

3535
after_success:
36-
- coveralls
3736
- codecov
38-
- if [[ $PYTHON_VERSION == 3.5 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source devtools/travis-ci/update_gh_pages.sh; fi
37+
- if [[ $PYTHON_VERSION == 3.7 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source devtools/travis-ci/update_gh_pages.sh; fi

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
[![Windows Build status](https://ci.appveyor.com/api/projects/status/x4aiyeio2c1xf3vx/branch/master?svg=true)](https://ci.appveyor.com/project/ctk3b/mbuild-o0viu/branch/master)
66
[![PyPI Version](https://badge.fury.io/py/mbuild.svg)](https://pypi.python.org/pypi/mbuild)
77
[![Binstar Badge](https://anaconda.org/mosdef/mbuild/badges/version.svg)](https://anaconda.org/mosdef/mbuild)
8-
[![Coverage Status](https://coveralls.io/repos/github/mosdef-hub/mbuild/badge.svg?branch=master)](https://coveralls.io/github/mosdef-hub/mbuild?branch=master)
98
[![codecov](https://codecov.io/gh/mosdef-hub/mbuild/branch/master/graph/badge.svg)](https://codecov.io/gh/mosdef-hub/mbuild)
109

1110
With just a few lines of mBuild code, you can assemble reusable components into

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ environment:
44

55
matrix:
66
- PYTHON: "C:\\Miniconda36-x64"
7-
CONDA_PY: "35"
7+
CONDA_PY: "36"
88
ARCH: "64"
99
- PYTHON: "C:\\Miniconda36-x64"
10-
CONDA_PY: "36"
10+
CONDA_PY: "37"
1111
ARCH: "64"
1212

1313
install:

docs/installation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ in order to get all of the dependencies.
4646
Supported Python Versions
4747
-------------------------
4848

49-
Python 2.7, 3.5 and 3.6 are officially supported, including testing during
49+
Python 2.7, 3.6 and 3.7 are officially supported, including testing during
5050
development and packaging. Support for Python 2.7 is planned to be dropped in
51-
late 2019. Other Python versions, such as 3.7 and 3.4 and older, may
51+
late 2019. Other Python versions, such as 3.8 and 3.5 and older, may
5252
successfully build and function but no guarantee is made.
5353

5454
Testing your installation

requirements-dev.txt

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,14 @@ packmol>=1!18.013
44
nglview>=0.6.2.3
55
oset
66
parmed
7-
# TODO: Remove pinning of mdtraj version once mol2 reader issues have been resolved.
8-
# https://github.com/mdtraj/mdtraj/pull/1378
9-
# Once this has been released in a new MDTraj version, this can be removed.
10-
mdtraj==1.9.1
11-
foyer
7+
mdtraj
8+
# TODO: Add back foyer when it can be built on Python 3.7
129
gsd
1310
openbabel
1411
networkx
1512
pytest >=3.0
1613
jupyter
1714
nbformat
18-
python-coveralls
19-
# TODO: Remove the pinning of the pytest-cov version again once issue
20-
# https://github.com/z4r/python-coveralls/issues/66
21-
# is resolved.
22-
# Background: pytest-cov 2.6.0 has increased the version
23-
# requirement for the coverage package from >=3.7.1 to
24-
# >=4.4, which is in conflict with the version requirement
25-
# defined by the python-coveralls package for coverage==4.0.3.
26-
# This fix from:
27-
# https://github.com/pywbem/pywbem/commit/d85a3e73e08d2846073087733b790b5a8864d93f
28-
pytest-cov>=2.4.0,<2.6
15+
pytest-cov
2916
pytest-faulthandler
3017
codecov

requirements.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@ packmol>=1!18.013
44
nglview>=0.6.2.3
55
oset
66
parmed
7-
# TODO: Remove pinning of mdtraj version once mol2 reader issues have been resolved.
8-
# https://github.com/mdtraj/mdtraj/pull/1378
9-
# Once this has been released in a new MDTraj version, this can be removed.
10-
mdtraj==1.9.1
7+
mdtraj

0 commit comments

Comments
 (0)