# HG changeset patch
# User RhodeCode Admin <admin@rhodecode.com>
# Date 2023-03-06 22:01:05
# Node ID dbcd47caf60fb4e705ae07ed218251e789243694
# Parent  39e9fabf7e00a3f96d5d52c4406ca43604042cec

requirements: fixed pycrypto backport and sqlalchemy <2.0

diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 alembic==1.10.0
   mako==1.2.4
     markupsafe==2.1.2
-  sqlalchemy==2.0.5.post1
+  sqlalchemy==1.4.46
     greenlet==2.0.2
     typing_extensions==4.5.0
   typing_extensions==4.5.0
@@ -170,6 +170,7 @@ py-bcrypt==0.4
 py-gfm==2.0.0
   markdown==3.4.1
 pycurl==7.45.2
+pycryptodome==3.17
 pymysql==1.0.2
 pyotp==2.8.0
 pyparsing==3.0.9
diff --git a/rhodecode/lib/jsonalchemy.py b/rhodecode/lib/jsonalchemy.py
--- a/rhodecode/lib/jsonalchemy.py
+++ b/rhodecode/lib/jsonalchemy.py
@@ -28,7 +28,7 @@ from rhodecode.lib.ext_json import json
 from rhodecode.lib.utils2 import safe_unicode
 
 
-class JsonRaw(unicode):
+class JsonRaw(str):
     """
     Allows interacting with a JSON types field using a raw string.
 
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -2675,7 +2675,10 @@ class RepoGroup(Base, BaseModel):
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    __mapper_args__ = {
+        #TODO: this is now depracated ?!
+        # 'order_by': 'group_name'
+    }
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/model/meta.py b/rhodecode/model/meta.py
--- a/rhodecode/model/meta.py
+++ b/rhodecode/model/meta.py
@@ -22,7 +22,7 @@
 SQLAlchemy Metadata and Session object
 """
 
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 from sqlalchemy.orm import scoped_session, sessionmaker
 
 from rhodecode.lib import caching_query