Skip to content

Commit

Permalink
Merge pull request #380 from waseem18/mypy-travis
Browse files Browse the repository at this point in the history
Fixes Travis build failure - Mypy
  • Loading branch information
sigmavirus24 committed Jul 14, 2018
2 parents a6c09dc + 9279343 commit 9ee1937
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ matrix:
include:
- python: 2.7
env: TOXENV=py27
- python: 2.7
- python: 3.6
env: TOXENV=lint
- python: 3.4
env: TOXENV=py34
Expand Down
3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ Sumana Harihareswara <sh@changeset.nyc>
Dustin Ingram <di@di.codes> (https://di.codes)
Jesse Jarzynka <jesse@jessejoe.com> (http://jessejoe.com)
László Kiss Kollár <kiss.kollar.laszlo@gmail.com>
Frances Hocutt <frances.hocutt@gmail.com>
Tathagata Dasgupta <tathagatadg@gmail.com>
Wasim Thabraze <wasim@thabraze.me>
4 changes: 2 additions & 2 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Either use ``tox`` to build against all supported Python versions (if
you have them installed) or use ``tox -e py{version}`` to test against
a specific version, e.g., ``tox -e py27`` or ``tox -e py34``.

Also, always run ``tox -e pep8`` before submitting a pull request.
Also, always run ``tox -e lint`` before submitting a pull request.

Submitting changes
^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -157,7 +157,7 @@ A checklist for creating, testing, and distributing a new version.
#. Run Twine tests:

#. ``tox -e py{27,34,35,36,py}``
#. ``tox -e pep8`` for the linter
#. ``tox -e lint`` for the linter
#. ``tox -e docs`` (this checks the Sphinx docs and uses
``readme_renderer`` to check that the ``long_description`` and other
metadata will render fine on the PyPI description)
Expand Down
9 changes: 5 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,pypy,py33,py34,py35,py36,docs,lint
envlist = lint,py27,pypy,py33,py34,py35,py36,docs

[testenv]
deps =
Expand Down Expand Up @@ -30,13 +30,14 @@ commands =
twine upload --skip-existing dist/*

[testenv:lint]
basepython = python2.7
basepython = python3.6
deps =
flake8
check-manifest
readme_renderer
mypy
commands =
flake8 twine/ tests/ docs/
flake8 twine/ tests/
check-manifest -v
python setup.py check -r -s

-mypy -s twine/ tests/
3 changes: 2 additions & 1 deletion twine/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
if sys.version_info > (3,):
input_func = input
else:
input_func = raw_input
# Ignore "undefined name" for flake8/python3
input_func = raw_input # noqa: F821


DEFAULT_REPOSITORY = "https://upload.pypi.org/legacy/"
Expand Down

0 comments on commit 9ee1937

Please sign in to comment.