From c714270ac51e6915b4591de38d70a3166e56ad33 Mon Sep 17 00:00:00 2001 From: KOLANICH Date: Thu, 13 Feb 2020 02:37:55 +0300 Subject: [PATCH] Fixing issues in my PR. + branch coverage + tests report (useless for travis, but useful for appveyor and gitlab, if you wanna port to it) --- .travis.yml | 13 ++++++++++--- pyproject.toml | 2 +- setup.cfg | 1 + 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08864b8..e89b8f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,19 @@ env: - ASTTOKENS_SLOW_TESTS=1 - COVERALLS_PARALLEL=true +before_install: + - pip install --upgrade setuptools>=44 wheel setuptools_scm[toml]>=3.4.3 pep517 + - pip install --upgrade coveralls + install: - - pip install coveralls - - pip install .[test] + #- python3 -m pep517.build . # replace the following command with this one when you drop python 2 + - python ./setup.py bdist_wheel + - export WHLNAME=./dist/asttokens-0.CI-py2.py3-none-any.whl + - mv ./dist/*.whl $WHLNAME + - pip install --upgrade --pre "$WHLNAME[test]" script: - - travis_wait 30 coverage run --include='asttokens/*' -m pytest + - travis_wait 30 coverage run --branch --include='asttokens/*' -m pytest --junitxml=./rspec.xml - coverage report -m after_success: diff --git a/pyproject.toml b/pyproject.toml index fc3f26f..2ca3753 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=41", "wheel", "setuptools_scm[toml]>=3.4.3"] +requires = ["setuptools>=44", "wheel", "setuptools_scm[toml]>=3.4.3"] build-backend = "setuptools.build_meta" [tool.setuptools_scm] diff --git a/setup.cfg b/setup.cfg index 2fd139d..38c62e3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,6 +31,7 @@ classifiers = [options] packages = asttokens install_requires = six +setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3 [options.extras_require] test = astroid; pytest