dls-controls / dls_ade

91%

master: 69%

LAST BUILD ON BRANCH systems-testing-general-dev

branch: systems-testing-general-dev

CHANGE BRANCH

x

Reset

• systems-testing-general-dev
• CGP-2-epics
• CGP-40
• CGP-42
• CGP-7_missing-tags
• CGP-8_logging-and-errors
• GitPython-version
• addgflag
• additional-sys-tests
• arg-parse-tests
• argparse-refactor
• argument-parsing-fixes
• auto-setup-systest-repos
• bb-build-test
• bb-refactor
• build-server-logging
• caRepeater
• changes-since-release-git-dev
• checkout-module-git-dev
• clone-multi-fix
• configure-tool
• coverage-cheating
• create-css-support
• data-preserve-mode
• default-commit
• dev
• dls-release-merge
• dls-release-messages
• dls-release-refactor
• doc-string-finishing
• etc
• expandcontrols
• final-additions
• fix-nosetests
• fix-print-logging
• gitlab
• gitlab-refine
• gitlab-settings
• gitpython-refactor
• improved-logging-output
• improved-maintainer-experience
• intersphinx-fix
• is-repo-path-fix
• linux-scripts
• list-branches-git-dev
• list-releases-git-dev
• logs-output-refactor
• master
• matlab
• mc-test-fix
• mc-test-fix-2
• module-contacts-fix
• module-contacts-git-dev
• module-ini
• new-git-scripts
• new-scripts
• nmc-refactoring-dev
• nmc-vendor-module-fix
• no-prefix-check-for-python-modules
• pipfilelocktovenv
• post-merge-refactor
• py3-compatibility-changes
• python3
• python3-build-system
• python3-create
• python3_wsystests
• refactor-constants
• refactor-dls-release
• refactor-mt
• release-default-git
• release-fix
• release-rhel7
• release-tag-creation-dev
• remotenames
• snm-doc-strings
• snm-doc-strings-v2
• start-new-module-git-dev
• svn-purge
• system-tests
• systems-testing-G
• systems-testing-snm-dev
• systemtests
• systest-setup-fixes
• systest-sphinx-docs
• tagchanges
• tar-module-git-dev
• tar_module_fix
• tarpythontoolfix
• test
• tidy-readme
• tidying
• vcs-git-refactor
• vcs_git-pathf-changes-dev
• vendor-scripts-update
• version-file

Build # 314

Build Type

push

travis-ci

Committed by GDYendell

Commit Message

Merge branch 'new-git-scripts' of github.com:dls-controls/dls_ade into systems-testing-general-dev

Conflicts resolved:
	dls_ade/dls_checkout_module.py
	dls_ade/dls_list_modules.py
	dls_ade/dls_module_contacts.py
	dls_ade/vcs_git.py
	docs/dls_ade.rst
	docs/dls_environment.rst

Run Details

4384 of 4820 relevant lines covered (90.95%)

0.91 hits per line