Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
8ca53fb5
Unverified
Commit
8ca53fb5
authored
6 years ago
by
Amber Brown
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Report combined coverage to codecov (#4225)
parent
f9b136a8
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+5
-5
5 additions, 5 deletions
.travis.yml
changelog.d/4225.misc
+1
-0
1 addition, 0 deletions
changelog.d/4225.misc
tox.ini
+17
-12
17 additions, 12 deletions
tox.ini
with
23 additions
and
17 deletions
.travis.yml
+
5
−
5
View file @
8ca53fb5
...
@@ -36,24 +36,24 @@ matrix:
...
@@ -36,24 +36,24 @@ matrix:
env
:
TOX_ENV="pep8,check_isort"
env
:
TOX_ENV="pep8,check_isort"
-
python
:
2.7
-
python
:
2.7
env
:
TOX_ENV=py27 TRIAL_FLAGS="-j 2"
env
:
TOX_ENV=py27
,codecov
TRIAL_FLAGS="-j 2"
-
python
:
2.7
-
python
:
2.7
env
:
TOX_ENV=py27-old TRIAL_FLAGS="-j 2"
env
:
TOX_ENV=py27-old TRIAL_FLAGS="-j 2"
-
python
:
2.7
-
python
:
2.7
env
:
TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4"
env
:
TOX_ENV=py27-postgres
,codecov
TRIAL_FLAGS="-j 4"
services
:
services
:
-
postgresql
-
postgresql
-
python
:
3.5
-
python
:
3.5
env
:
TOX_ENV=py35 TRIAL_FLAGS="-j 2"
env
:
TOX_ENV=py35
,codecov
TRIAL_FLAGS="-j 2"
-
python
:
3.6
-
python
:
3.6
env
:
TOX_ENV=py36 TRIAL_FLAGS="-j 2"
env
:
TOX_ENV=py36
,codecov
TRIAL_FLAGS="-j 2"
-
python
:
3.6
-
python
:
3.6
env
:
TOX_ENV=py36-postgres TRIAL_FLAGS="-j 4"
env
:
TOX_ENV=py36-postgres
,codecov
TRIAL_FLAGS="-j 4"
services
:
services
:
-
postgresql
-
postgresql
...
...
This diff is collapsed.
Click to expand it.
changelog.d/4225.misc
0 → 100644
+
1
−
0
View file @
8ca53fb5
Added automated coverage reporting to CI.
This diff is collapsed.
Click to expand it.
tox.ini
+
17
−
12
View file @
8ca53fb5
...
@@ -7,6 +7,7 @@ deps =
...
@@ -7,6 +7,7 @@ deps =
mock
mock
python-subunit
python-subunit
junitxml
junitxml
coverage
# needed by some of the tests
# needed by some of the tests
lxml
lxml
...
@@ -27,11 +28,15 @@ deps =
...
@@ -27,11 +28,15 @@ deps =
setenv
=
setenv
=
PYTHONDONTWRITEBYTECODE
=
no_byte_code
PYTHONDONTWRITEBYTECODE
=
no_byte_code
COVERAGE_PROCESS_START
=
{toxinidir}/.coveragerc
[testenv]
[testenv]
deps
=
deps
=
{
[base]
deps}
{
[base]
deps}
whitelist_externals
=
sh
setenv
=
setenv
=
{
[base]
setenv}
{
[base]
setenv}
...
@@ -39,7 +44,9 @@ passenv = *
...
@@ -39,7 +44,9 @@ passenv = *
commands
=
commands
=
/usr/bin/find
"{toxinidir}"
-name
'*.pyc'
-delete
/usr/bin/find
"{toxinidir}"
-name
'*.pyc'
-delete
"{envbindir}/trial"
{env:TRIAL_FLAGS:}
{posargs:tests}
{env:TOXSUFFIX:}
# Add this so that coverage will run on subprocesses
sh
-c
'echo
"import
coverage
; coverage.process_startup()" > {envsitepackagesdir}/../sitecustomize.py'
{envbindir}/coverage
run
"{envbindir}/trial"
{env:TRIAL_FLAGS:}
{posargs:tests}
{env:TOXSUFFIX:}
[testenv:py27]
[testenv:py27]
...
@@ -101,17 +108,6 @@ usedevelop=true
...
@@ -101,17 +108,6 @@ usedevelop=true
[testenv:py36]
[testenv:py36]
usedevelop
=
true
usedevelop
=
true
[testenv:py36-coverage]
usedevelop
=
true
deps
=
{
[base]
deps}
coverage
commands
=
/usr/bin/find
"{toxinidir}"
-name
'*.pyc'
-delete
python
-m
coverage
run
-m
twisted.trial
{env:TRIAL_FLAGS:}
{posargs:tests}
{env:TOXSUFFIX:}
[testenv:py36-postgres]
[testenv:py36-postgres]
usedevelop
=
true
usedevelop
=
true
deps
=
deps
=
...
@@ -146,3 +142,12 @@ deps = towncrier>=18.6.0rc1
...
@@ -146,3 +142,12 @@ deps = towncrier>=18.6.0rc1
commands
=
commands
=
python
-m
towncrier.check
--compare-with
=
origin/develop
python
-m
towncrier.check
--compare-with
=
origin/develop
basepython
=
python3.6
basepython
=
python3.6
[testenv:codecov]
skip_install
=
True
deps
=
coverage
codecov
commands
=
coverage
combine
codecov
-X
gcov
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment