Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • inet_support
  • master
  • deb-cleanup
  • v0.1.0
  • v0.1.1
  • v0.2.0
6 results

Target

Select target project
  • uffd / uffd-socketmapd
1 result
Select Git revision
  • inet_support
  • master
  • deb-cleanup
  • v0.1.0
  • v0.1.1
  • v0.2.0
6 results
Show changes

Commits on Source 2

2 files
+ 35
− 17
Compare changes
  • Side-by-side
  • Inline

Files

.gitlab-ci.yml

+33 −8
Original line number Original line Diff line number Diff line 
image: registry.git.cccv.de/uffd/docker-images/buster

image: registry.git.cccv.de/uffd/docker-images/bookworm





variables:

variables:

  DEBIAN_FRONTEND: noninteractive

  DEBIAN_FRONTEND: noninteractive

  GIT_SUBMODULE_STRATEGY: normal

  GIT_SUBMODULE_STRATEGY: normal

  APT_API_URL: https://packages.cccv.de

  APT_API_URL: https://packages.cccv.de

  APT_REPO: uffd

  APT_REPO: uffd

  PYLINT_PIN: pylint~=2.10.0

  PYLINT_PIN: pylint~=2.16.2





before_script:

before_script:

  - python3 -V

  - python3 -V
@@ -59,14 +59,27 @@ linter:bullseye: 
    reports:

    reports:

      codequality: codeclimate.json

      codequality: codeclimate.json





linter:bookworm:

  image: registry.git.cccv.de/uffd/docker-images/bookworm

  stage: test

  script:

  - pip3 install $PYLINT_PIN pylint-gitlab pylint-flask-sqlalchemy # this force-updates jinja2 and some other packages!

  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabCodeClimateReporter 'uffd-socketmapd' > codeclimate.json

  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabPagesHtmlReporter 'uffd-socketmapd' > pylint.html

  - python3 -m pylint --rcfile .pylintrc --output-format=text 'uffd-socketmapd'

  artifacts:

    when: always

    paths:

    - pylint.html

    reports:

      codequality: codeclimate.json



unittests:buster:

unittests:buster:

  image: registry.git.cccv.de/uffd/docker-images/buster

  image: registry.git.cccv.de/uffd/docker-images/buster

  stage: test

  stage: test

  script:

  script:

  - python3-coverage run --include 'uffd-socketmapd' -m pytest --junitxml=report.xml || true

  - python3-coverage run --include 'uffd-socketmapd' -m pytest --junitxml=report.xml || true

  #- python3-coverage report -m

  - python3-coverage html

  - python3-coverage html

  #- python3-coverage xml

  artifacts:

  artifacts:

    when: always

    when: always

    paths:

    paths:
@@ -74,17 +87,28 @@ unittests:buster: 
    - htmlcov

    - htmlcov

    expose_as: 'Coverage Report'

    expose_as: 'Coverage Report'

    reports:

    reports:

      #coverage_report:

      #  coverage_format: cobertura

      #  path: coverage.xml

      junit: report.xml

      junit: report.xml

  #coverage: '/^TOTAL.*\s+(\d+\%)$/'





unittests:bullseye:

unittests:bullseye:

  image: registry.git.cccv.de/uffd/docker-images/bullseye

  image: registry.git.cccv.de/uffd/docker-images/bullseye

  stage: test

  stage: test

  script:

  script:

  - python3-coverage run --include 'uffd-socketmapd' -m pytest --junitxml=report.xml || true

  - python3-coverage run --include 'uffd-socketmapd' -m pytest --junitxml=report.xml || true

  - python3-coverage html

  artifacts:

    when: always

    paths:

    - htmlcov/index.html

    - htmlcov

    expose_as: 'Coverage Report'

    reports:

      junit: report.xml



unittests:bookworm:

  image: registry.git.cccv.de/uffd/docker-images/bookworm

  stage: test

  script:

  - python3-coverage run --include 'uffd-socketmapd' -m pytest --junitxml=report.xml || true

  - python3-coverage report -m

  - python3-coverage report -m

  - python3-coverage html

  - python3-coverage html

  - python3-coverage xml

  - python3-coverage xml
@@ -117,5 +141,6 @@ publish:apt: 
  - echo Update published repo for all distros

  - echo Update published repo for all distros

  - 'curl --user "${APTLY_API_USER}:${APTLY_API_PW}" -X PUT -H "Content-Type: application/json" --data "{ }" "${APT_API_URL}/api/publish/${APT_REPO}/buster"'

  - 'curl --user "${APTLY_API_USER}:${APTLY_API_PW}" -X PUT -H "Content-Type: application/json" --data "{ }" "${APT_API_URL}/api/publish/${APT_REPO}/buster"'

  - 'curl --user "${APTLY_API_USER}:${APTLY_API_PW}" -X PUT -H "Content-Type: application/json" --data "{ }" "${APT_API_URL}/api/publish/${APT_REPO}/bullseye"'

  - 'curl --user "${APTLY_API_USER}:${APTLY_API_PW}" -X PUT -H "Content-Type: application/json" --data "{ }" "${APT_API_URL}/api/publish/${APT_REPO}/bullseye"'

  - 'curl --user "${APTLY_API_USER}:${APTLY_API_PW}" -X PUT -H "Content-Type: application/json" --data "{ }" "${APT_API_URL}/api/publish/${APT_REPO}/bookworm"'

  dependencies:

  dependencies:

  - build:apt
 
  - build:apt

.pylintrc

+2 −9
Original line number Original line Diff line number Diff line
@@ -379,13 +379,6 @@ max-line-length=160 
# Maximum number of lines in a module.

# Maximum number of lines in a module.

max-module-lines=1000

max-module-lines=1000





# List of optional constructs for which whitespace checking is disabled. `dict-

# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.

# `trailing-comma` allows a space between comma and closing bracket: (a, ).

# `empty-line` allows space-only lines.

no-space-check=trailing-comma,

               dict-separator



# Allow the body of a class to be on the same line as the declaration if body

# Allow the body of a class to be on the same line as the declaration if body

# contains single statement.

# contains single statement.

single-line-class-stmt=no

single-line-class-stmt=no
@@ -506,5 +499,5 @@ min-public-methods=2 




# Exceptions that will emit a warning when being caught. Defaults to

# Exceptions that will emit a warning when being caught. Defaults to

# "BaseException, Exception".

# "BaseException, Exception".

overgeneral-exceptions=BaseException,

overgeneral-exceptions=builtins.BaseException,

                       Exception
 
                       builtins.Exception

Impressum - Datenschutzerklärung