Permalink
Browse files

add python 3.7 support (#90)

* add python 3.7 support

* pin `Sphinx<1.8` because `releases` requires it

If we don't do this, pipenv seems to get confused on `pipenv update`:
it first selects the latest version of Sphinx, `==1.8.1`, and then
tries to re-resolve the tree with that pinned. Only then does it
discover that `releases` wants `Sphinx<1.8`, and then it errors with
unsatisfiable dependencies.

* Change travis config to support python 3.7

See travis-ci/travis-ci#9815 (comment)
  • Loading branch information...
leifwalsh authored and thejunglejane committed Sep 23, 2018
1 parent 11e2d15 commit 93af385fb30b43bcfa71885e7a4267bcba64ee56
Showing with 152 additions and 117 deletions.
  1. +3 −1 .travis.yml
  2. +1 −1 Pipfile
  3. +135 −104 Pipfile.lock
  4. +1 −0 classifiers.txt
  5. +3 −3 docs/contributing.rst
  6. +1 −1 marbles/core/setup.py
  7. +8 −7 tox.ini
@@ -1,8 +1,10 @@
sudo: false
sudo: true
dist: xenial
language: python
python:
- "3.5"
- "3.6"
- "3.7"
install: pip install tox-travis codecov
script: tox
cache: pip
@@ -13,7 +13,7 @@ coverage = "*"
"flake8" = "*"
"flake8-per-file-ignores" = "*"
releases = "*"
Sphinx = "*"
Sphinx = "<1.8"
sphinx_rtd_theme = "*"
tox = "*"
twine = "*"

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -12,6 +12,7 @@ Natural Language :: English
Operating System :: OS Independent
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Topic :: Documentation
Topic :: Scientific/Engineering
Topic :: Software Development :: Libraries :: Python Modules
@@ -155,9 +155,9 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Make sure
your new functionality is documented with docstrings and appropriate
additions to the Sphinx docs, and add the feature to the list in README.md.
3. The pull request should work for Python 2.7, 3.4, 3.5, and 3.6, and for
PyPy. Check https://travis-ci.org/twosigma/marbles/pull_requests and make
sure that the tests pass for all supported Python versions.
3. The pull request should work for Python 3.5, 3.6, and 3.7. Check
https://travis-ci.org/twosigma/marbles/pull_requests and make sure
that the tests pass for all supported Python versions.
4. In order to accept your code contributions, please fill out the appropriate
Contributor License Agreement in the `cla folder
<https://github.com/twosigma/marbles/tree/master/cla>`__ and submit it to
@@ -62,7 +62,7 @@
'flake8-per-file-ignores'
]
},
python_requires='>=3.4,<3.7',
python_requires='>=3.5,<3.8',
license='MIT',
description=('A unittest extension that provides additional '
'information on test failure'),
15 tox.ini
@@ -1,9 +1,10 @@
[tox]
envlist = flake8, coverage, docs, py35, py36
envlist = flake8, coverage, docs, py35, py36, py37

[travis]
python =
3.6: flake8, coverage, docs, py36
3.7: flake8, coverage, docs, py37
3.6: py36
3.5: py35

[testenv]
@@ -16,14 +17,14 @@ commands=
pipenv run python marbles/mixins/setup.py test

[testenv:flake8]
basepython = python3.6
basepython = python3.7
commands=
pipenv install --dev
pipenv run python -m flake8 --version
pipenv run python -m flake8

[testenv:coverage]
basepython = python3.6
basepython = python3.7
commands=
pipenv install --dev
pipenv run python -m coverage erase
@@ -34,13 +35,13 @@ commands=
pipenv run python -m coverage html

[testenv:docs]
basepython = python3.6
basepython = python3.7
commands=
pipenv install --dev
pipenv run python setup.py build_sphinx -Ea

[testenv:pypi]
basepython = python3.6
basepython = python3.7
whitelist_externals=
bash
commands=
@@ -49,4 +50,4 @@ commands=
pipenv run bash -c "cd marbles/core; python setup.py sdist bdist_wheel"
pipenv run bash -c "cd marbles/mixins; python setup.py sdist bdist_wheel"
pipenv run python setup.py sdist bdist_wheel
twine upload --repository-url=https://upload.pypi.org/legacy/ dist/* marbles/core/dist/* marbles/mixins/dist/*
twine upload --repository-url=https://upload.pypi.org/legacy/ dist/* marbles/core/dist/* marbles/mixins/dist/*

0 comments on commit 93af385

Please sign in to comment.