From c775bb99497b0c89746c3cc658ace45f9016a12e Mon Sep 17 00:00:00 2001 From: David Lord Date: Sun, 26 Jan 2020 22:21:08 -0800 Subject: remove test and coverage results from ci --- .azure-pipelines.yml | 21 ++------------------- MANIFEST.in | 4 +++- setup.cfg | 6 +++--- tox.ini | 20 +------------------- 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index eabcaf7..680a15c 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -5,7 +5,7 @@ trigger: variables: vmImage: ubuntu-latest python.version: '3.8' - TOXENV: py,coverage-ci + TOXENV: py hasTestResults: 'true' strategy: @@ -26,9 +26,6 @@ strategy: python.version: '3.5' Python 2.7 Linux: python.version: '2.7' - Python 2.7 Windows: - python.version: '2.7' - vmImage: windows-latest Docs: TOXENV: docs hasTestResults: 'false' @@ -48,19 +45,5 @@ steps: - script: pip --disable-pip-version-check install -U tox displayName: Install tox - - script: tox -s false -- --junit-xml=test-results.xml + - script: tox displayName: Run tox - - - task: PublishTestResults@2 - inputs: - testResultsFiles: test-results.xml - testRunTitle: $(Agent.JobName) - condition: eq(variables['hasTestResults'], 'true') - displayName: Publish test results - - - task: PublishCodeCoverageResults@1 - inputs: - codeCoverageTool: Cobertura - summaryFileLocation: coverage.xml - condition: eq(variables['hasTestResults'], 'true') - displayName: Publish coverage results diff --git a/MANIFEST.in b/MANIFEST.in index 8cae0c7..909102a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,9 @@ -include CHANGES.rst tox.ini +include CHANGES.rst +include tox.ini graft artwork graft docs prune docs/_build graft examples graft ext graft tests +global-exclude *.pyc diff --git a/setup.cfg b/setup.cfg index efa15ca..2769e96 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,6 @@ [metadata] license_file = LICENSE.rst +long_description_content_type = text/x-rst [bdist_wheel] universal = true @@ -18,9 +19,8 @@ source = [coverage:paths] source = - src/jinja2 - .tox/*/lib/python*/site-packages/jinja2 - .tox/*/site-packages/jinja2 + src + */site-packages [flake8] # B = bugbear diff --git a/tox.ini b/tox.ini index 3ee86d1..679ebeb 100644 --- a/tox.ini +++ b/tox.ini @@ -3,14 +3,12 @@ envlist = py{38,37,36,35,27,py3,py} style docs - coverage skip_missing_interpreters = true [testenv] deps = - coverage pytest -commands = coverage run -p -m pytest --tb=short --basetemp={envtmpdir} {posargs} +commands = pytest --tb=short --basetemp={envtmpdir} {posargs} [testenv:style] deps = pre-commit @@ -20,19 +18,3 @@ commands = pre-commit run --all-files --show-diff-on-failure [testenv:docs] deps = -r docs/requirements.txt commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html - -[testenv:coverage] -deps = coverage -skip_install = true -commands = - coverage combine - coverage html - coverage report - -[testenv:coverage-ci] -deps = coverage -skip_install = true -commands = - coverage combine - # Ignoring errors because 2.7.15 and 3.5.5 on Azure can't parse async files. - coverage xml --ignore-errors -- cgit v1.2.1