From ab6df1c75a83f0ced7983a60cd168e9680dc02e7 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sat, 11 May 2019 22:06:40 +0200 Subject: [PATCH 1/3] fix #335 - use signature and add py38 to the matrix --- .travis.yml | 2 ++ src/setuptools_scm/utils.py | 3 ++- tox.ini | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79ebf425..a614ab98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,8 @@ python: - '3.4' - '3.5' - '3.6' +- '3.7' +- '3.8' env: - TOXENV=py-test diff --git a/src/setuptools_scm/utils.py b/src/setuptools_scm/utils.py index 7e4e9f53..5b59005a 100644 --- a/src/setuptools_scm/utils.py +++ b/src/setuptools_scm/utils.py @@ -100,7 +100,8 @@ def function_has_arg(fn, argname): if PY2: argspec = inspect.getargspec(fn).args else: - argspec = inspect.getfullargspec(fn).args + + argspec = inspect.signature(fn).parameters return argname in argspec diff --git a/tox.ini b/tox.ini index f06b6317..54a322a4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py{27,34,35,36,37}-test,flake8,check_readme,py{27,37}-selfcheck +envlist=py{27,34,35,36,37,38}-test,flake8,check_readme,py{27,37}-selfcheck [pytest] filterwarnings=error From b7d56af1c6daca1bc53d4ffc95433d32eaf546aa Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sun, 12 May 2019 09:49:19 +0200 Subject: [PATCH 2/3] Update .travis.yml - py38 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Miro Hrončok --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a614ab98..71fc6be8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,8 @@ python: - '3.5' - '3.6' - '3.7' -- '3.8' +- '3.8-dev' +dist: xenial # needed for 3.7+ env: - TOXENV=py-test From ef1ffef2fea1d9148c9f0445f7745d2868026c74 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sun, 12 May 2019 09:56:46 +0200 Subject: [PATCH 3/3] make the issue marker known --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 54a322a4..129f9b47 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,8 @@ envlist=py{27,34,35,36,37,38}-test,flake8,check_readme,py{27,37}-selfcheck [pytest] filterwarnings=error +markers= + issue(id): reference to github issue [flake8] max-complexity = 10