Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ python:
- 2.7
- 3.4
- 3.5
- &mainstream_python 3.6
- 3.6
- &mainstream_python 3.7-dev
- &pypy pypy
- pypy3.5
- 3.7-dev
install:
- &upgrade_python_toolset pip install --upgrade pip setuptools wheel
- pip install tox-travis
Expand All @@ -21,7 +21,7 @@ jobs:
fast_finish: true
include:
- stage: Static analisys
python: *mainstream_python
python: 3.6
services: skip
install:
- *upgrade_python_toolset
Expand Down Expand Up @@ -53,6 +53,7 @@ jobs:
- ./tools/run_docker.sh "exec_helpers"
before_deploy:
- pip install -r build_requirements.txt
- python setup.py bdist_wheel
deploy:
- provider: pypi
# `skip_cleanup: true` is required to preserve binary wheels, built
Expand All @@ -63,7 +64,7 @@ jobs:
secure: "maml4+SU/6NtRf7JIwWhVyXkesE9Gk5Umdo3txOjcrcvt84S3NlN/hFgdNclMUpJ3b+rOFEpiZOamtDKbP67uhlA6yJ364SxW5T3ZQJ8tjFFzMHcaM38HgGbgLR8AxK8fdZKRg9gVMnGofeiusB5aNsKmn9XnvESc8dNv0Umdmi83wXxm+DfVRXL8VTFgwsH3BxQy/Kdv6upRrXyNWkyoi8Zk8PkrFFDpFoW9WK1fRBqnvCw1Wt8nEAJah7y2b7vj52eM+MfT3IL+jpocZqOJQlFPdWkTonX7mAP9nB97kk4DMbm3ZqUw2Qr9pM0nKK9HhrXhsSSUGa1w95zmw9nbXLrpfnQ61Lyk9pGcVh60WbrVKstE/x9Lq3pqGsA/YKqsIZK3OAqRfBHNG9L7lekP05hXyDNHJXGoEyGQjVA/666S2ZCjM10XaaUmZ5P1kPGocCnEjv86dKdINTkFM6L0n4oIu1nyftBhVu9jz0xQaxute4LZNJiQtE6x8NX3WuSO68UhWjDqevYdRgW55Gp1OD4ilfA/SVNPpsHJfB2baue1fi9m8Rn3bWQSJoZ8twYHoIxEOAIXyMBhYnmldvsuUY6h5p+/hk6kpJAsTXZFjUSa/FPIH84QvDkNCoZxwInSkjEN1tj9PBep2vYcLMd92+g6udtin8FbYMZItiDl1M="
on:
tags: true
distributions: sdist bdist_wheel
distributions: sdist
skip_upload_docs: true

cache: pip
Expand Down
1 change: 1 addition & 0 deletions CI_REQUIREMENTS.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
mock # no assert_called_once in py35
futures>=3.1; python_version == "2.7"
enum34>=1.1; python_version == "2.7"
-r requirements.txt
9 changes: 9 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
include *.rst LICENSE requirements.txt
global-exclude *.c
exclude Makefile
prune tools
exclude .travis.yml appveyor.yml
exclude tox.ini pytest.ini .coveragerc
prune test
prune .github
prune docs
exclude CODEOWNERS CODE_OF_CONDUCT.md _config.yml
5 changes: 0 additions & 5 deletions TODO.md

This file was deleted.

2 changes: 1 addition & 1 deletion exec_helpers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
'ExecResult',
)

__version__ = '1.3.2'
__version__ = '1.3.3'
__author__ = "Alexey Stepanov"
__author_email__ = 'penguinolog@gmail.com'
__maintainers__ = {
Expand Down
2 changes: 1 addition & 1 deletion exec_helpers/ssh_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def username(self): # type: () -> typing.Optional[str]
return self.__username

@staticmethod
def __get_public_key(key): # type: () -> typing.Optional[str]
def __get_public_key(key): # type: (typing.Union[paramiko.RSAKey, None]) -> typing.Optional[str]
"""Internal method for get public key from private.

:type key: paramiko.RSAKey
Expand Down
2 changes: 1 addition & 1 deletion tools/build-wheels.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m"
PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m"

# Avoid creation of __pycache__/*.py[c|o]
export PYTHONDONTWRITEBYTECODE=1
Expand Down
11 changes: 8 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[tox]
minversion = 2.0
envlist = pep8, pep257, py{27,34,35,36,37,py,py3}, pylint, bandit, py{34,35,36}-nocov, docs,
envlist = pep8, pep257, py{27,34,35,36,37,py,py3}, pylint, bandit, py{34,35,36,37}-nocov, docs,
skipsdist = True
skip_missing_interpreters = True

Expand Down Expand Up @@ -49,6 +49,13 @@ commands =
pip install exec_helpers --no-index -f dist
py.test -vv {posargs:test}

[testenv:py37-nocov]
usedevelop = False
commands =
python setup.py bdist_wheel
pip install exec_helpers --no-index -f dist
py.test -vv {posargs:test}

[testenv:venv]
commands = {posargs:}

Expand Down Expand Up @@ -80,15 +87,13 @@ usedevelop = False
commands = pip install ./ -vvv -U

[testenv:pylint]
basepython = python3.6
usedevelop = False
deps =
pylint
-r{toxinidir}/CI_REQUIREMENTS.txt
commands = pylint exec_helpers

[flake8]
basepython = python3.6
exclude =
.venv,
.git,
Expand Down