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
  • 18-implement-textgridlockmanager
  • 5-initial-setup-integration-junit-tests-for-tgapi
  • main
  • 1.0.0
  • 1.0.1
  • 1.0.2
  • 1.1.0
  • 1.1.1
  • 1.1.2
  • 1.1.3
  • 1.2.0
  • 1.2.1
  • 1.2.2
  • 1.2.3
  • 1.2.4
  • 1.2.5
  • 1.3.0
  • 1.3.1
  • 1.4.0
  • 1.4.1
  • 1.4.2
21 results

Target

Select target project
No results found
Select Git revision
  • 18-implement-textgridlockmanager
  • 5-initial-setup-integration-junit-tests-for-tgapi
  • main
  • 1.0.0
  • 1.0.1
  • 1.0.2
  • 1.1.0
  • 1.1.1
  • 1.1.2
  • 1.1.3
  • 1.2.0
  • 1.2.1
  • 1.2.2
  • 1.2.3
  • 1.2.4
  • 1.2.5
  • 1.3.0
  • 1.3.1
  • 1.4.0
  • 1.4.1
  • 1.4.2
21 results
Show changes

Commits on Source 10

25 files
+ 302
− 24
Compare changes
  • Side-by-side
  • Inline

Files

.cz.yaml

+1 −1
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0

.dockerignore

+1 −1
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0

.gitignore

+1 −1
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0

.gitlab-ci.yml

+7 −5
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0
@@ -7,7 +7,6 @@ workflow: 
  rules:

    - if: $CI_MERGE_REQUEST_IID

    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_COMMIT_TAG



stages:

  - test
@@ -55,17 +54,20 @@ build container image: 
    name: gcr.io/kaniko-project/executor:debug

    entrypoint: [""]

  script:

    - "[[ -n $CI_COMMIT_TAG ]] && export version=$CI_COMMIT_TAG || export version=$CI_COMMIT_SHORT_SHA"

    # always succeed and don't print error message

    - tag=$(git tag --contains $CI_COMMIT_SHORT_SHA 2>&1) || true

    # use tag for version if not empty; else commit sha

    - "[[ -n $tag ]] && export version=$tag || export version=$CI_COMMIT_SHORT_SHA"

    - mkdir -p /kaniko/.docker

    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64 | tr -d '\n')\"},\"$harbor_registry\":{\"auth\":\"$HARBOR_ROBOT_TOKEN64\"}}}" > /kaniko/.docker/config.json

    - /kaniko/executor

      --context $CI_PROJECT_DIR

      --dockerfile $CI_PROJECT_DIR/Dockerfile

      --build-arg build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')

      --build-arg vcs_ref=${version}

      --build-arg vcs_ref=${CI_COMMIT_SHORT_SHA}

      --build-arg version=${version}

      --destination $CI_REGISTRY_IMAGE/repdav:$version

      --destination $harbor_registry/$harbor_repo/repdav:$version

  rules:

    - if: $CI_MERGE_REQUEST_IID

    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
    - if: $CI_COMMIT_TAG

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0

.pylintrc

+1 −1
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0

.vscode/launch.json.license

+1 −1
Original line number Diff line number Diff line 
SPDX-FileCopyrightText: 2022 Stefan Hynek

SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen



SPDX-License-Identifier: CC0-1.0

.vscode/settings.json.license

+1 −1
Original line number Diff line number Diff line 
SPDX-FileCopyrightText: 2022 Stefan Hynek

SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen



SPDX-License-Identifier: CC0-1.0

AUTHORS

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0

#

# This is the list of textgrid-clients's significant contributors.

#

# This does not necessarily list everyone who has contributed code.

# To see the full list of contributors, see the revision history in

# source control.

Stefan Hynek

Ubbo Veentjer

CHANGELOG.md

+7 −0
Original line number Diff line number Diff line 
## [1.1.3](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/compare/1.1.2...1.1.3) (2022-11-29)





### Bug Fixes



* **wsgidav:** update to remediate GHSA-xx6g-jj35-pxjv, CVE-2022-41905 ([a6f91cc](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/commit/a6f91cc20e3a1766d9746f3b10eb08bb31eab85e)), closes [#32](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/issues/32)



## [1.1.2](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/compare/1.1.1...1.1.2) (2022-02-28)

CHANGELOG.md.license

+1 −1
Original line number Diff line number Diff line 
SPDX-FileCopyrightText: 2022 Stefan Hynek

SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen



SPDX-License-Identifier: CC0-1.0

Dockerfile

+1 −1
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0

docker-compose.yml

+1 −1
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0

package-lock.json.license

+1 −1
Original line number Diff line number Diff line 
SPDX-FileCopyrightText: 2022 Stefan Hynek

SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen



SPDX-License-Identifier: CC0-1.0

package.json

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ 
        {

          "assets": [

            "CHANGELOG.md"

          ],

          "message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}"

          ]

        }

      ]

    ]

package.json.license

+1 −1
Original line number Diff line number Diff line 
SPDX-FileCopyrightText: 2022 Stefan Hynek

SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen



SPDX-License-Identifier: CC0-1.0

requirements.dev.txt

+1 −1
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0

requirements.txt

+4 −4
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Stefan Hynek

# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0



https://gitlab.gwdg.de/dariah-de/textgridrep/textgrid-python-clients/-/archive/ce076d15a29aeb13a87cc33d343b6730a2ec22ec/textgrid-python-clients-1d58717eb0175514eba5dec759c07c4be3090f16.tar.gz

cheroot==8.5.2

sentry-sdk==1.4.3

WsgiDAV==4.0.1
 
cheroot==9.0.0

sentry-sdk==1.11.1

WsgiDAV==4.1.0

src/main.py

+4 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0



"""Configure and start the WSGI DAV Server."""

import logging

import os

src/repdav/config.py

+4 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0



import os



from .errors import EnvNotSetError

src/repdav/errors.py

+4 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: CC0-1.0



"""Custom error classes

"""

import logging

src/repdav/textgrid_dav_provider.py

+4 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: AGPL-3.0-or-later



"""The DAV resource provider and its resources.

"""

import io

src/repdav/textgrid_domain_controller.py

+4 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: AGPL-3.0-or-later



import logging

from wsgidav.dc.base_dc import BaseDomainController

# see https://github.com/mar10/wsgidav/blob/master/wsgidav/dc/base_dc.py

src/repdav/textgrid_named_dav_provider.py

+4 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 Georg-August-Universität Göttingen

#

# SPDX-License-Identifier: AGPL-3.0-or-later



import logging

from pprint import pformat