##// END OF EJS Templates
requirements: fixed pycrypto backport and sqlalchemy <2.0
super-admin -
r4918:dbcd47ca default
parent child Browse files
Show More
@@ -3,7 +3,7 b''
3 alembic==1.10.0
3 alembic==1.10.0
4 mako==1.2.4
4 mako==1.2.4
5 markupsafe==2.1.2
5 markupsafe==2.1.2
6 sqlalchemy==2.0.5.post1
6 sqlalchemy==1.4.46
7 greenlet==2.0.2
7 greenlet==2.0.2
8 typing_extensions==4.5.0
8 typing_extensions==4.5.0
9 typing_extensions==4.5.0
9 typing_extensions==4.5.0
@@ -170,6 +170,7 b' py-bcrypt==0.4'
170 py-gfm==2.0.0
170 py-gfm==2.0.0
171 markdown==3.4.1
171 markdown==3.4.1
172 pycurl==7.45.2
172 pycurl==7.45.2
173 pycryptodome==3.17
173 pymysql==1.0.2
174 pymysql==1.0.2
174 pyotp==2.8.0
175 pyotp==2.8.0
175 pyparsing==3.0.9
176 pyparsing==3.0.9
@@ -28,7 +28,7 b' from rhodecode.lib.ext_json import json'
28 from rhodecode.lib.utils2 import safe_unicode
28 from rhodecode.lib.utils2 import safe_unicode
29
29
30
30
31 class JsonRaw(unicode):
31 class JsonRaw(str):
32 """
32 """
33 Allows interacting with a JSON types field using a raw string.
33 Allows interacting with a JSON types field using a raw string.
34
34
@@ -2675,7 +2675,10 b' class RepoGroup(Base, BaseModel):'
2675 UniqueConstraint('group_name', 'group_parent_id'),
2675 UniqueConstraint('group_name', 'group_parent_id'),
2676 base_table_args,
2676 base_table_args,
2677 )
2677 )
2678 __mapper_args__ = {'order_by': 'group_name'}
2678 __mapper_args__ = {
2679 #TODO: this is now depracated ?!
2680 # 'order_by': 'group_name'
2681 }
2679
2682
2680 CHOICES_SEPARATOR = '/' # used to generate select2 choices for nested groups
2683 CHOICES_SEPARATOR = '/' # used to generate select2 choices for nested groups
2681
2684
@@ -22,7 +22,7 b''
22 SQLAlchemy Metadata and Session object
22 SQLAlchemy Metadata and Session object
23 """
23 """
24
24
25 from sqlalchemy.ext.declarative import declarative_base
25 from sqlalchemy.orm import declarative_base
26 from sqlalchemy.orm import scoped_session, sessionmaker
26 from sqlalchemy.orm import scoped_session, sessionmaker
27
27
28 from rhodecode.lib import caching_query
28 from rhodecode.lib import caching_query
General Comments 0
You need to be logged in to leave comments. Login now