release: merge back stable branch into default

2022-10-06 10:06:46 +02:00 · 2022-10-06 10:06:46 +02:00 · 063cb9f16b
commit 063cb9f16b
parent dca58047e2 f9311617c3
3 changed files with 326 additions and 305 deletions
--- a/pkgs/patches/rhodecode_tools/setuptools.patch
+++ b/pkgs/patches/rhodecode_tools/setuptools.patch
@ -9,4 +9,5 @@ diff -rup rhodecode-tools-1.4.1-orig/setup.py rhodecode-tools-1.4.1/setup.py
 +setup_requirements = ['pytest-runner==5.1.0']
 install_requirements = _get_requirements(
     'requirements.txt', exclude=['setuptools'])
- test_requirements = _get_requirements('requirements_test.txt')
+ -test_requirements = _get_requirements('requirements_test.txt')
+ -test_requirements = []
--- a/requirements.txt
+++ b/requirements.txt
@ -117,8 +117,6 @@ https://code.rhodecode.com/rhodecode-tools-ce/artifacts/download/0-d9ea7914-e475
 ## appenlight
 appenlight-client==0.6.26

-## test related requirements
-r requirements_test.txt

 ## uncomment to add the debug libraries
 #-r requirements_debug.txt
--- a/rhodecode/i18n/rhodecode.pot
+++ b/rhodecode/i18n/rhodecode.pot