diff --git a/.copier-answers.yml b/.copier-answers.yml index 0028412..61df65f 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,10 +1,10 @@ # Changes here will be overwritten by Copier -_commit: v5.0.2 +_commit: v6.1.0 _src_path: gh:eccenca/cmem-plugin-template author_mail: streitmatter@informatik.uni-leipzig.de author_name: Denis Streitmatter github_page: https://github.com/dbpedia/cmem-plugin-databus project_description: Load and publish datasets from a DBpedia databus service. project_slug: databus -pypi: false +pypi: true diff --git a/.flake8 b/.flake8 deleted file mode 100644 index ffd12bc..0000000 --- a/.flake8 +++ /dev/null @@ -1,4 +0,0 @@ -# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8 -[flake8] -max-line-length = 88 -extend-ignore = E203 diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f510917..d5bd94d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -16,10 +16,11 @@ jobs: check: runs-on: ubuntu-latest + concurrency: testing_environment steps: - name: Check out repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Task uses: arduino/setup-task@v1 @@ -41,21 +42,13 @@ jobs: run: | poetry self add "poetry-dynamic-versioning[plugin]" - - name: bandit - run: | - task check:bandit - - - name: flake8 - run: | - task check:flake8 - - name: mypy run: | task check:mypy - - name: pylint + - name: ruff run: | - task check:pylint + task check:ruff - name: pytest env: @@ -69,7 +62,7 @@ jobs: task check:safety - name: Publish Test Report in Action - uses: mikepenz/action-junit-report@v3 + uses: mikepenz/action-junit-report@v4 if: always() # always run even if the previous step fails with: report_paths: dist/junit-*.xml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f873e83..664ec5e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Check out repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Task uses: arduino/setup-task@v1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cde0edb..13f67e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,25 +19,15 @@ stages: - build - publish -bandit: +ruff: stage: test script: - - task check:bandit + - task check:ruff artifacts: when: always reports: junit: - - dist/junit-bandit.xml - -flake8: - stage: test - script: - - task check:flake8 - artifacts: - when: always - reports: - junit: - - dist/junit-flake8.xml + - dist/junit-ruff.xml mypy: stage: test @@ -49,16 +39,6 @@ mypy: junit: - dist/junit-mypy.xml -pylint: - stage: test - script: - - task check:pylint - artifacts: - when: always - reports: - junit: - - dist/junit-pylint.xml - pytest: stage: test coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/' @@ -70,6 +50,8 @@ pytest: coverage_report: coverage_format: cobertura path: dist/coverage.xml + junit: + - dist/junit-pytest.xml paths: - dist/badge-coverage.svg - dist/badge-tests.svg @@ -84,7 +66,6 @@ safety: build: stage: build needs: - - bandit - mypy - pytest - safety @@ -100,8 +81,7 @@ pypi: # publishing only available on a tag stage: publish needs: - - flake8 - - pylint + - ruff - build allow_failure: true when: manual diff --git a/.idea/cmem-plugin-databus.iml b/.idea/cmem-plugin-databus.iml index 90b3b86..5a0d7bc 100644 --- a/.idea/cmem-plugin-databus.iml +++ b/.idea/cmem-plugin-databus.iml @@ -4,16 +4,15 @@ - - + -