# HG changeset patch # User RhodeCode Admin # Date 2023-03-06 15:05:27 # Node ID 2b749a9ab53cd05028172251f445c963b9afc0f4 # Parent 0c9c5a5c6c7c89dc1fd5bb4bfbde2b0902b05ee9 deps: removed pinned deps in favor of moving them back into the requirements.txt file itself diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ sdist: .PHONY: dev-env ## Build sdist dev-env: - pip install -r requirements.txt -r requirements_pinned.txt -r requirements_debug.txt -r requirements_test.txt + pip install -r requirements.txt -r requirements_debug.txt -r requirements_test.txt pip install -e . # Default command on calling make diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -32,6 +32,26 @@ zope.interface==5.5.2 gunicorn==20.1.0 waitress==2.1.2 +# contains not directly required libraries we want to pin the version. + +atomicwrites==1.4.1 +attrs==22.2.0 +contextlib2==21.6.0 +cffi==1.15.1 +hupper==1.11 +importlib-metadata==6.0.0 +packaging==23.0 +pathlib2==2.3.7.post1 +pygments==2.14.0 +pyparsing==3.0.9 +psutil==5.9.4 +pluggy==1.0.0 +scandir==1.10.0 +setproctitle==1.3.2 +venusian==3.0.0 +wcwidth==0.2.6 +toml==0.10.2 + ## test related requirements -r requirements_test.txt diff --git a/requirements_pinned.txt b/requirements_pinned.txt deleted file mode 100644 --- a/requirements_pinned.txt +++ /dev/null @@ -1,19 +0,0 @@ -# contains not directly required libraries we want to pin the version. - -atomicwrites==1.4.1 -attrs==22.2.0 -contextlib2==21.6.0 -cffi==1.15.1 -hupper==1.11 -importlib-metadata==6.0.0 -packaging==23.0 -pathlib2==2.3.7.post1 -pygments==2.14.0 -pyparsing==3.0.9 -psutil==5.9.4 -pluggy==1.0.0 -scandir==1.10.0 -setproctitle==1.3.2 -venusian==3.0.0 -wcwidth==0.2.6 -toml==0.10.2 diff --git a/vcsserver/lib/_vendor/jsonlogger/__init__.py b/vcsserver/lib/_vendor/jsonlogger/__init__.py --- a/vcsserver/lib/_vendor/jsonlogger/__init__.py +++ b/vcsserver/lib/_vendor/jsonlogger/__init__.py @@ -142,7 +142,7 @@ class JsonFormatter(ExceptionAwareFormat self._required_fields = self.parse() self._skip_fields = dict(list(zip(self._required_fields, - self._required_fields))) + self._required_fields))) self._skip_fields.update(self.reserved_attrs) def _str_to_fn(self, fn_as_str):