diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33ee561903507115863d189ed578ee4f1b19c641..7fe247c42ec27cd29c0550ecf9e3066d05699aed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,16 +24,6 @@ stages: # You can specify an unlimited number of jobs which are defined as top-level elements with an arbitrary name and always # have to contain at least the script clause. -build wheel: - stage: build - tags: - - k8srunner - script: - - python3 setup.py sdist bdist_wheel - artifacts: - paths: - - ./dist/ - # The test job produces a coverage report and the unittest output (see setup.cfg), and # the coverage xml report is moved to the reports directory while the html output is persisted for use by the pages # job. TODO: possibly a candidate for refactor / renaming later on. @@ -76,28 +66,6 @@ linting: paths: - ./build -publish to nexus: - stage: publish - tags: - - k8srunner - variables: - TWINE_USERNAME: $TWINE_USERNAME - TWINE_PASSWORD: $TWINE_PASSWORD - script: - # Note: katversion will include the git hash in the version for non-tagged commits, but need git - # Check metadata requirements - - scripts/validate-metadata.sh - - python3 -m pip install twine - - twine upload --repository-url $PYPI_REPOSITORY_URL dist/* - only: - refs: - - tags - variables: - # Confirm tag message exists - - $CI_COMMIT_MESSAGE =~ /^.+$/ - # Confirm semantic versioning of tag - - $CI_COMMIT_TAG =~ /^((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)$/ - pages: stage: deploy tags: @@ -130,3 +98,7 @@ create ci metrics: artifacts: paths: - ./build + +include: +- project: 'ska-telescope/templates-repository' + file: 'gitlab-ci/includes/build_wheel.yml' \ No newline at end of file diff --git a/tests/test_configuration.py b/tests/test_configuration.py index 8c4e3826516c1b2b45760a0cc72d7592cd08f135..107ba5fac67d5f9a978070940ce9d27c06bb9d96 100644 --- a/tests/test_configuration.py +++ b/tests/test_configuration.py @@ -18,7 +18,7 @@ def reset_logging(): yield manager = logging.root.manager manager.disabled = logging.NOTSET - for logger in list(manager.loggerDict.values()) + [logging.root]: + for logger in list(manager.loggerDict.values()) + [logging.root]: # pylint: disable=no-member if isinstance(logger, logging.Logger): logger.setLevel(logging.NOTSET) logger.propagate = True