diff --git a/.dockerignore b/.dockerignore index daa40ea..a649c24 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,5 @@ .eggs -build dist .pytest_cache docs -Dockerfile *~ diff --git a/Dockerfile b/Dockerfile index 4080473..ae3e99c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,8 +69,7 @@ COPY --from=build \ /build/dist/*.whl \ /build/dist/*.tar.gz \ /build/docs/*.html \ - /build/build/coverage.xml \ - /build/build/nosetests.xml \ + /build/build \ /build/ RUN pip install /build/*.whl diff --git a/setup.py b/setup.py index 6ce5725..96f14e8 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ setup_requires=['setuptools_scm', 'robotframework<4'] + pytest_runner, tests_require=['pytest-runner', 'pytest-cov', 'pytest-mock', 'coverage', 'pytest-pylint', 'pytest-html', 'setuptools_scm', - 'robotframework<4','mock'] + special_test_requires, + 'robotframework<4', 'mock', 'natsort'], test_suite='tests', cmdclass = {'build_rf_docs': setup_command.BuildLibDoc}, zip_safe = True, diff --git a/sonar-project.properties b/sonar-project.properties index 2ea878a..63d3d33 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,8 +1,10 @@ sonar.host.url=https://sonarcloud.io sonar.organization=madworx sonar.projectKey=robotframework-kicadlibrary -sonar.sources=./src +sonar.sources=src +sonar.tests=src/tests sonar.projectName=robotframework-kicadlibrary -sonar.exclusions=src/KiCadLibrary/kicad_library_utils/**,src/robotdoc/**,src/tests/**,src/KiCadLibrary/__main__.py +sonar.exclusions=src/KiCadLibrary/kicad_library_utils/**,src/robotdoc/**,src/KiCadLibrary/__main__.py,src/tests/** sonar.python.coverage.reportPaths=build/coverage.xml sonar.python.xunit.reportPath=build/nosetests.xml +