diff --git a/requirements.txt b/requirements.txt index 59792712..27fbd56f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,9 @@ alembic==1.13.1 typing_extensions==4.15.0 babel==2.12.1 beaker==1.13.0 -celery==5.6.1 +bleach==6.3.0 + webencodings==0.5.1 +celery==5.6.2 billiard==4.2.4 click-didyoumean==0.3.1 click==8.1.8 @@ -31,7 +33,7 @@ channelstream==0.7.1 gevent==25.9.1 greenlet==3.3.0 zope.event==6.1.0 - zope.interface==8.1.1 + zope.interface==8.2.0 itsdangerous==1.1.0 marshmallow==2.18.0 pyramid==2.0.2 @@ -44,8 +46,8 @@ channelstream==0.7.1 venusian==3.1.0 webob==1.8.9 zope.deprecation==6.0.0 - zope.interface==8.1.1 - pyramid-jinja2==2.10 + zope.interface==8.2.0 + pyramid-jinja2==2.10.1 jinja2==3.1.6 MarkupSafe==3.0.3 MarkupSafe==3.0.3 @@ -59,7 +61,7 @@ channelstream==0.7.1 venusian==3.1.0 webob==1.8.9 zope.deprecation==6.0.0 - zope.interface==8.1.1 + zope.interface==8.2.0 zope.deprecation==6.0.0 python-dateutil==2.9.0.post0 six==1.17.0 @@ -67,7 +69,7 @@ channelstream==0.7.1 certifi==2025.11.12 charset-normalizer==3.4.4 idna==3.11 - urllib3==2.6.2 + urllib3==2.6.3 ws4py==0.5.1 deform==2.0.15 chameleon==3.10.2 @@ -85,13 +87,13 @@ dogpile.cache==1.5.0 pbr==5.11.1 formencode==2.1.1 six==1.17.0 -fsspec==2025.10.0 +fsspec==2026.1.0 gunicorn==23.0.0 - packaging==24.1 + packaging==25.0 gevent==25.9.1 greenlet==3.3.0 zope.event==6.1.0 - zope.interface==8.1.1 + zope.interface==8.2.0 ipython==8.26.0 decorator==5.1.1 jedi==0.19.1 @@ -113,58 +115,77 @@ ipython==8.26.0 markdown==3.4.3 msgpack==1.1.2 mysqlclient==2.1.1 -nbconvert==7.7.3 - beautifulsoup4==4.12.3 - soupsieve==2.5 - bleach==6.1.0 - six==1.17.0 +nbconvert==7.16.6 + beautifulsoup4==4.14.3 + soupsieve==2.8.1 + typing_extensions==4.15.0 + bleach==6.3.0 webencodings==0.5.1 defusedxml==0.7.1 jinja2==3.1.6 - MarkupSafe==3.0.3 - jupyter_core==5.3.1 - platformdirs==3.10.0 + markupsafe==3.0.3 + jupyter_core==5.9.1 + platformdirs==4.5.1 traitlets==5.14.3 - jupyterlab-pygments==0.2.2 - MarkupSafe==3.0.3 - mistune==2.0.5 - nbclient==0.8.0 - jupyter_client==8.3.0 - jupyter_core==5.3.1 - platformdirs==3.10.0 + jupyterlab_pygments==0.3.0 + markupsafe==3.0.3 + mistune==3.2.0 + nbclient==0.10.4 + jupyter_client==8.8.0 + jupyter_core==5.9.1 + platformdirs==4.5.1 traitlets==5.14.3 python-dateutil==2.9.0.post0 six==1.17.0 - pyzmq==26.2.0 - tornado==6.5.3 + pyzmq==27.1.0 + tornado==6.5.4 traitlets==5.14.3 - jupyter_core==5.3.1 - platformdirs==3.10.0 + jupyter_core==5.9.1 + platformdirs==4.5.1 traitlets==5.14.3 - nbformat==5.9.2 - fastjsonschema==2.18.0 - jsonschema==4.18.6 + nbformat==5.10.4 + fastjsonschema==2.21.2 + jsonschema==4.26.0 attrs==25.4.0 - pyrsistent==0.19.3 - jupyter_core==5.3.1 - platformdirs==3.10.0 + jsonschema-specifications==2025.9.1 + referencing==0.37.0 + attrs==25.4.0 + rpds-py==0.30.0 + typing_extensions==4.15.0 + referencing==0.37.0 + attrs==25.4.0 + rpds-py==0.30.0 + typing_extensions==4.15.0 + rpds-py==0.30.0 + jupyter_core==5.9.1 + platformdirs==4.5.1 traitlets==5.14.3 traitlets==5.14.3 traitlets==5.14.3 - nbformat==5.9.2 - fastjsonschema==2.18.0 - jsonschema==4.18.6 + nbformat==5.10.4 + fastjsonschema==2.21.2 + jsonschema==4.26.0 attrs==25.4.0 - pyrsistent==0.19.3 - jupyter_core==5.3.1 - platformdirs==3.10.0 + jsonschema-specifications==2025.9.1 + referencing==0.37.0 + attrs==25.4.0 + rpds-py==0.30.0 + typing_extensions==4.15.0 + referencing==0.37.0 + attrs==25.4.0 + rpds-py==0.30.0 + typing_extensions==4.15.0 + rpds-py==0.30.0 + jupyter_core==5.9.1 + platformdirs==4.5.1 traitlets==5.14.3 traitlets==5.14.3 - pandocfilters==1.5.0 + packaging==25.0 + pandocfilters==1.5.1 pygments==2.19.2 - tinycss2==1.2.1 - webencodings==0.5.1 traitlets==5.14.3 +tinycss2==1.4.0 + webencodings==0.5.1 orjson==3.11.5 paste==3.10.1 premailer==3.10.0 @@ -176,7 +197,7 @@ premailer==3.10.0 certifi==2025.11.12 charset-normalizer==3.4.4 idna==3.11 - urllib3==2.6.2 + urllib3==2.6.3 psutil==5.9.8 psycopg2==2.9.11 py-bcrypt==0.4 @@ -199,13 +220,13 @@ pyramid-mailer==0.15.1 venusian==3.1.0 webob==1.8.9 zope.deprecation==6.0.0 - zope.interface==8.1.1 + zope.interface==8.2.0 repoze.sendmail==4.4.1 transaction==5.0.0 - zope.interface==8.1.1 - zope.interface==8.1.1 + zope.interface==8.2.0 + zope.interface==8.2.0 transaction==5.0.0 - zope.interface==8.1.1 + zope.interface==8.2.0 pyramid-mako==1.1.0 mako==1.3.10 MarkupSafe==3.0.3 @@ -219,7 +240,7 @@ pyramid-mako==1.1.0 venusian==3.1.0 webob==1.8.9 zope.deprecation==6.0.0 - zope.interface==8.1.1 + zope.interface==8.2.0 python-ldap==3.4.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 @@ -238,9 +259,9 @@ regex==2022.10.31 routes==2.5.1 repoze.lru==0.7 six==1.17.0 -s3fs==2025.10.0 - aiobotocore==2.26.0 - aiohttp==3.13.2 +s3fs==2026.1.0 + aiobotocore==3.1.0 + aiohttp==3.13.3 aiohappyeyeballs==2.6.1 aiosignal==1.4.0 frozenlist==1.8.0 @@ -254,18 +275,18 @@ s3fs==2025.10.0 multidict==6.7.0 propcache==0.4.1 aioitertools==0.13.0 - botocore==1.41.5 + botocore==1.42.19 jmespath==1.0.1 python-dateutil==2.9.0.post0 six==1.17.0 - urllib3==2.6.2 + urllib3==2.6.3 python-dateutil==2.9.0.post0 six==1.17.0 jmespath==1.0.1 multidict==6.7.0 - wrapt==1.17.3 - fsspec==2025.10.0 - aiohttp==3.13.2 + wrapt==2.0.1 + fsspec==2026.1.0 + aiohttp==3.13.3 aiohappyeyeballs==2.6.1 aiosignal==1.4.0 frozenlist==1.8.0 diff --git a/requirements_rc_tools.txt b/requirements_rc_tools.txt index ad021ba5..dbb1732d 100644 --- a/requirements_rc_tools.txt +++ b/requirements_rc_tools.txt @@ -1,3 +1,3 @@ ## rhodecode-tools, special case, use file://PATH.tar.gz#egg=rhodecode-tools==X.Y.Z, to test local version -rhodecode-tools @ https://code.rhodecode.com/_file_store/download/0-3b32d557-a810-4e87-a58b-b5c96d2c1513.4.0.tar.gz#egg=rhodecode-tools -rhodecode-tools==4.4.0 +rhodecode-tools @ https://code.rhodecode.com/_file_store/download/0-473aa318-9185-4a5b-9e65-e175187396f0.4.1.tar.gz#egg=rhodecode-tools +rhodecode-tools==4.4.1 diff --git a/requirements_test.txt b/requirements_test.txt index 190ec9ec..3c6aeae3 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -4,49 +4,49 @@ mock==5.1.0 pytest==8.3.3 iniconfig==2.0.0 - packaging==24.1 + packaging==25.0 pluggy==1.5.0 pytest-cov==5.0.0 coverage==7.6.4 pytest==8.3.3 iniconfig==2.0.0 - packaging==24.1 + packaging==25.0 pluggy==1.5.0 pytest-env==1.1.5 pytest==8.3.3 iniconfig==2.0.0 - packaging==24.1 + packaging==25.0 pluggy==1.5.0 pytest-profiling==1.7.0 gprof2dot==2024.6.6 pytest==8.3.3 iniconfig==2.0.0 - packaging==24.1 + packaging==25.0 pluggy==1.5.0 six==1.17.0 pytest-rerunfailures==14.0 - packaging==24.1 + packaging==25.0 pytest==8.3.3 iniconfig==2.0.0 - packaging==24.1 + packaging==25.0 pluggy==1.5.0 pytest-runner==6.0.1 pytest-sugar==1.0.0 - packaging==24.1 + packaging==25.0 pytest==8.3.3 iniconfig==2.0.0 - packaging==24.1 + packaging==25.0 pluggy==1.5.0 termcolor==2.5.0 pytest-timeout==2.3.1 pytest==8.3.3 iniconfig==2.0.0 - packaging==24.1 + packaging==25.0 pluggy==1.5.0 -webtest==3.0.1 - beautifulsoup4==4.12.3 - soupsieve==2.5 +webtest==3.0.7 + beautifulsoup4==4.14.3 + soupsieve==2.8.1 waitress==3.0.2 webob==1.8.9 diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py b/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py index 49ed26b9..35ecf829 100644 --- a/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py +++ b/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py @@ -17,6 +17,8 @@ # and proprietary license terms, please see https://rhodecode.com/licenses/ import os +import time + import pytest from rhodecode.tests import TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS @@ -54,6 +56,12 @@ class TestVCSOperations(object): branch_permission_setter(repo_name, username, permission=branch_perm) clone_url = rcstack.repo_clone_url(repo.repo_name, user=username, passwd=password) + # Give VCSServer time to initialize the empty Mercurial repository + # Empty hg repos (unlike git bare repos) need a moment to be fully indexed + # This prevents intermittent "repository is unrelated" errors + time.sleep(0.2) + repo.scm_instance(cache=False) # Force load in VCSServer + Command(os.path.dirname(tmpdir.strpath)).execute("hg clone", clone_url, tmpdir.strpath) stdout, stderr = _add_files_and_push("hg", tmpdir.strpath, clone_url=clone_url)