requirements: fixed pycrypto backport and sqlalchemy <2.0

requirements.txt

@@ -1,267 +1,268 b''
 # deps, generated via pipdeptree --exclude setuptools,wheel,pipdeptree,pip -f | tr '[:upper:]' '[:lower:]'
 
 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
 babel==2.12.1
 celery==5.2.7
   billiard==3.6.4.0
   click==8.1.3
   click-didyoumean==0.3.0
     click==8.1.3
   click-plugins==1.1.1
     click==8.1.3
   click-repl==0.2.0
     click==8.1.3
     prompt-toolkit==3.0.38
       wcwidth==0.2.6
     six==1.16.0
   kombu==5.2.4
     amqp==5.1.1
       vine==5.0.0
     vine==5.0.0
   pytz==2022.7.1
   vine==5.0.0
 channelstream==0.7.1
   gevent==22.10.2
     greenlet==2.0.2
     zope.event==4.6
     zope.interface==5.5.2
   itsdangerous==1.1.0
   marshmallow==2.18.0
   pyramid==2.0.1
     hupper==1.11
     plaster==1.1.2
     plaster-pastedeploy==1.0.1
       pastedeploy==3.0.1
       plaster==1.1.2
     translationstring==1.4
     venusian==3.0.0
     webob==1.8.7
     zope.deprecation==4.4.0
     zope.interface==5.5.2
   pyramid-apispec==0.3.3
     apispec==1.3.3
   pyramid-jinja2==2.10
     jinja2==3.1.2
       markupsafe==2.1.2
     markupsafe==2.1.2
     pyramid==2.0.1
       hupper==1.11
       plaster==1.1.2
       plaster-pastedeploy==1.0.1
         pastedeploy==3.0.1
         plaster==1.1.2
       translationstring==1.4
       venusian==3.0.0
       webob==1.8.7
       zope.deprecation==4.4.0
       zope.interface==5.5.2
     zope.deprecation==4.4.0
   python-dateutil==2.8.2
     six==1.16.0
   requests==2.28.2
     certifi==2022.12.7
     charset-normalizer==3.1.0
     idna==3.4
     urllib3==1.26.14
   ws4py==0.5.1
 configobj==5.0.8
   six==1.16.0
 deform==2.0.15
   chameleon==3.10.2
   colander==2.0
     iso8601==1.1.0
     translationstring==1.4
   iso8601==1.1.0
   peppercorn==0.6
   translationstring==1.4
   zope.deprecation==4.4.0
 docutils==0.19
 dogpile.cache==1.1.8
   decorator==5.1.1
   stevedore==5.0.0
     pbr==5.11.1
 formencode==2.0.1
   six==1.16.0
 gunicorn==20.1.0
 infrae.cache==1.0.1
   beaker==1.12.1
   repoze.lru==0.7
 msgpack-python==0.5.6
 mysqlclient==2.1.1
 nbconvert==7.2.9
   beautifulsoup4==4.11.2
     soupsieve==2.4
   bleach==6.0.0
     six==1.16.0
     webencodings==0.5.1
   defusedxml==0.7.1
   jinja2==3.1.2
     markupsafe==2.1.2
   jupyter_core==5.2.0
     platformdirs==3.1.0
     traitlets==5.9.0
   jupyterlab-pygments==0.2.2
   markupsafe==2.1.2
   mistune==2.0.5
   nbclient==0.7.2
     jupyter_client==8.0.3
       jupyter_core==5.2.0
         platformdirs==3.1.0
         traitlets==5.9.0
       python-dateutil==2.8.2
         six==1.16.0
       pyzmq==25.0.0
       tornado==6.2
       traitlets==5.9.0
     jupyter_core==5.2.0
       platformdirs==3.1.0
       traitlets==5.9.0
     nbformat==5.7.3
       fastjsonschema==2.16.3
       jsonschema==4.17.3
         attrs==22.2.0
         pyrsistent==0.19.3
       jupyter_core==5.2.0
         platformdirs==3.1.0
         traitlets==5.9.0
       traitlets==5.9.0
     traitlets==5.9.0
   nbformat==5.7.3
     fastjsonschema==2.16.3
     jsonschema==4.17.3
       attrs==22.2.0
       pyrsistent==0.19.3
     jupyter_core==5.2.0
       platformdirs==3.1.0
       traitlets==5.9.0
     traitlets==5.9.0
   packaging==23.0
   pandocfilters==1.5.0
   pygments==2.14.0
   tinycss2==1.2.1
     webencodings==0.5.1
   traitlets==5.9.0
 pastescript==3.3.0
   paste==3.5.2
     six==1.16.0
   pastedeploy==3.0.1
   six==1.16.0
 pathlib2==2.3.7.post1
   six==1.16.0
 premailer==3.10.0
   cachetools==5.3.0
   cssselect==1.2.0
   cssutils==2.6.0
   lxml==4.9.2
   requests==2.28.2
     certifi==2022.12.7
     charset-normalizer==3.1.0
     idna==3.4
     urllib3==1.26.14
 psutil==5.9.4
 psycopg2==2.9.5
 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
 pyramid-debugtoolbar==4.10
   pygments==2.14.0
   pyramid==2.0.1
     hupper==1.11
     plaster==1.1.2
     plaster-pastedeploy==1.0.1
       pastedeploy==3.0.1
       plaster==1.1.2
     translationstring==1.4
     venusian==3.0.0
     webob==1.8.7
     zope.deprecation==4.4.0
     zope.interface==5.5.2
   pyramid-mako==1.1.0
     mako==1.2.4
       markupsafe==2.1.2
     pyramid==2.0.1
       hupper==1.11
       plaster==1.1.2
       plaster-pastedeploy==1.0.1
         pastedeploy==3.0.1
         plaster==1.1.2
       translationstring==1.4
       venusian==3.0.0
       webob==1.8.7
       zope.deprecation==4.4.0
       zope.interface==5.5.2
 pyramid-mailer==0.15.1
   pyramid==2.0.1
     hupper==1.11
     plaster==1.1.2
     plaster-pastedeploy==1.0.1
       pastedeploy==3.0.1
       plaster==1.1.2
     translationstring==1.4
     venusian==3.0.0
     webob==1.8.7
     zope.deprecation==4.4.0
     zope.interface==5.5.2
   repoze.sendmail==4.4.1
     transaction==3.0.1
       zope.interface==5.5.2
     zope.interface==5.5.2
   transaction==3.0.1
     zope.interface==5.5.2
 python-ldap==3.4.3
   pyasn1==0.4.8
   pyasn1-modules==0.2.8
     pyasn1==0.4.8
 python-memcached==1.59
   six==1.16.0
 python-pam==2.0.2
 python3-saml==1.15.0
   isodate==0.6.1
     six==1.16.0
   lxml==4.9.2
   xmlsec==1.3.13
     lxml==4.9.2
 pyyaml==6.0
 redis==4.5.1
   async-timeout==4.0.2
 regex==2022.10.31
 routes==2.5.1
   repoze.lru==0.7
   six==1.16.0
 simplejson==3.18.3
 sshpubkeys==3.3.1
   cryptography==39.0.2
     cffi==1.15.1
       pycparser==2.21
   ecdsa==0.18.0
     six==1.16.0
 supervisor==4.2.5
 tzlocal==4.2
   pytz-deprecation-shim==0.1.0.post0
     tzdata==2022.7
 urlobject==2.4.3
 waitress==2.1.2
 weberror==0.13.1
   paste==3.5.2
     six==1.16.0
   pygments==2.14.0
   tempita==0.5.2
   webob==1.8.7
 webhelpers2==2.0
   markupsafe==2.1.2
   six==1.16.0
 whoosh==2.7.4
 zope.cachedescriptors==4.4
 
 ## uncomment to add the debug libraries
 #-r requirements_debug.txt

rhodecode/lib/jsonalchemy.py

@@ -1,279 +1,279 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import collections
 
 import sqlalchemy
 from sqlalchemy import UnicodeText
 from sqlalchemy.ext.mutable import Mutable
 
 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.
 
     For example::
         db_instance = JsonTable()
         db_instance.enabled = True
         db_instance.json_data = JsonRaw('{"a": 4}')
 
     This will bypass serialization/checks, and allow storing
     raw values
     """
     pass
 
 
 # Set this to the standard dict if Order is not required
 DictClass = collections.OrderedDict
 
 
 class JSONEncodedObj(sqlalchemy.types.TypeDecorator):
     """
     Represents an immutable structure as a json-encoded string.
 
     If default is, for example, a dict, then a NULL value in the
     database will be exposed as an empty dict.
     """
 
     impl = UnicodeText
     safe = True
     enforce_unicode = True
 
     def __init__(self, *args, **kwargs):
         self.default = kwargs.pop('default', None)
         self.safe = kwargs.pop('safe_json', self.safe)
         self.enforce_unicode = kwargs.pop('enforce_unicode', self.enforce_unicode)
         self.dialect_map = kwargs.pop('dialect_map', {})
         super(JSONEncodedObj, self).__init__(*args, **kwargs)
 
     def load_dialect_impl(self, dialect):
         if dialect.name in self.dialect_map:
             return dialect.type_descriptor(self.dialect_map[dialect.name])
         return dialect.type_descriptor(self.impl)
 
     def process_bind_param(self, value, dialect):
         if isinstance(value, JsonRaw):
             value = value
         elif value is not None:
             value = json.dumps(value)
             if self.enforce_unicode:
                 value = safe_unicode(value)
         return value
 
     def process_result_value(self, value, dialect):
         if self.default is not None and (not value or value == '""'):
             return self.default()
 
         if value is not None:
             try:
                 value = json.loads(value, object_pairs_hook=DictClass)
             except Exception as e:
                 if self.safe and self.default is not None:
                     return self.default()
                 else:
                     raise
         return value
 
 
 class MutationObj(Mutable):
     @classmethod
     def coerce(cls, key, value):
         if isinstance(value, dict) and not isinstance(value, MutationDict):
             return MutationDict.coerce(key, value)
         if isinstance(value, list) and not isinstance(value, MutationList):
             return MutationList.coerce(key, value)
         return value
 
     def de_coerce(self):
         return self
 
     @classmethod
     def _listen_on_attribute(cls, attribute, coerce, parent_cls):
         key = attribute.key
         if parent_cls is not attribute.class_:
             return
 
         # rely on "propagate" here
         parent_cls = attribute.class_
 
         def load(state, *args):
             val = state.dict.get(key, None)
             if coerce:
                 val = cls.coerce(key, val)
                 state.dict[key] = val
             if isinstance(val, cls):
                 val._parents[state.obj()] = key
 
         def set(target, value, oldvalue, initiator):
             if not isinstance(value, cls):
                 value = cls.coerce(key, value)
             if isinstance(value, cls):
                 value._parents[target.obj()] = key
             if isinstance(oldvalue, cls):
                 oldvalue._parents.pop(target.obj(), None)
             return value
 
         def pickle(state, state_dict):
             val = state.dict.get(key, None)
             if isinstance(val, cls):
                 if 'ext.mutable.values' not in state_dict:
                     state_dict['ext.mutable.values'] = []
                 state_dict['ext.mutable.values'].append(val)
 
         def unpickle(state, state_dict):
             if 'ext.mutable.values' in state_dict:
                 for val in state_dict['ext.mutable.values']:
                     val._parents[state.obj()] = key
 
         sqlalchemy.event.listen(parent_cls, 'load', load, raw=True,
                                 propagate=True)
         sqlalchemy.event.listen(parent_cls, 'refresh', load, raw=True,
                                 propagate=True)
         sqlalchemy.event.listen(parent_cls, 'pickle', pickle, raw=True,
                                 propagate=True)
         sqlalchemy.event.listen(attribute, 'set', set, raw=True, retval=True,
                                 propagate=True)
         sqlalchemy.event.listen(parent_cls, 'unpickle', unpickle, raw=True,
                                 propagate=True)
 
 
 class MutationDict(MutationObj, DictClass):
     @classmethod
     def coerce(cls, key, value):
         """Convert plain dictionary to MutationDict"""
         self = MutationDict(
             (k, MutationObj.coerce(key, v)) for (k, v) in value.items())
         self._key = key
         return self
 
     def de_coerce(self):
         return dict(self)
 
     def __setitem__(self, key, value):
         # Due to the way OrderedDict works, this is called during __init__.
         # At this time we don't have a key set, but what is more, the value
         # being set has already been coerced. So special case this and skip.
         if hasattr(self, '_key'):
             value = MutationObj.coerce(self._key, value)
         DictClass.__setitem__(self, key, value)
         self.changed()
 
     def __delitem__(self, key):
         DictClass.__delitem__(self, key)
         self.changed()
 
     def __setstate__(self, state):
         self.__dict__ = state
 
     def __reduce_ex__(self, proto):
         # support pickling of MutationDicts
         d = dict(self)
         return (self.__class__, (d,))
 
 
 class MutationList(MutationObj, list):
     @classmethod
     def coerce(cls, key, value):
         """Convert plain list to MutationList"""
         self = MutationList((MutationObj.coerce(key, v) for v in value))
         self._key = key
         return self
 
     def de_coerce(self):
         return list(self)
 
     def __setitem__(self, idx, value):
         list.__setitem__(self, idx, MutationObj.coerce(self._key, value))
         self.changed()
 
     def __setslice__(self, start, stop, values):
         list.__setslice__(self, start, stop,
                           (MutationObj.coerce(self._key, v) for v in values))
         self.changed()
 
     def __delitem__(self, idx):
         list.__delitem__(self, idx)
         self.changed()
 
     def __delslice__(self, start, stop):
         list.__delslice__(self, start, stop)
         self.changed()
 
     def append(self, value):
         list.append(self, MutationObj.coerce(self._key, value))
         self.changed()
 
     def insert(self, idx, value):
         list.insert(self, idx, MutationObj.coerce(self._key, value))
         self.changed()
 
     def extend(self, values):
         list.extend(self, (MutationObj.coerce(self._key, v) for v in values))
         self.changed()
 
     def pop(self, *args, **kw):
         value = list.pop(self, *args, **kw)
         self.changed()
         return value
 
     def remove(self, value):
         list.remove(self, value)
         self.changed()
 
 
 def JsonType(impl=None, **kwargs):
     """
     Helper for using a mutation obj, it allows to use .with_variant easily.
     example::
 
         settings = Column('settings_json',
             MutationObj.as_mutable(
             JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
     """
 
     if impl == 'list':
         return JSONEncodedObj(default=list, **kwargs)
     elif impl == 'dict':
         return JSONEncodedObj(default=DictClass, **kwargs)
     else:
         return JSONEncodedObj(**kwargs)
 
 
 JSON = MutationObj.as_mutable(JsonType())
 """
 A type to encode/decode JSON on the fly
 
 sqltype is the string type for the underlying DB column::
 
     Column(JSON) (defaults to UnicodeText)
 """
 
 JSONDict = MutationObj.as_mutable(JsonType('dict'))
 """
 A type to encode/decode JSON dictionaries on the fly
 """
 
 JSONList = MutationObj.as_mutable(JsonType('list'))
 """
 A type to encode/decode JSON lists` on the fly
 """

rhodecode/model/meta.py

@@ -1,45 +1,45 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 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
 
 __all__ = ['Base', 'Session']
 
 # scoped_session.  Apply our custom CachingQuery class to it,
 # using a callable that will associate the dictionary
 # of regions with the Query.
 # to use cache use this in query
 # .options(FromCache("sqlalchemy_cache_type", "cachekey"))
 Session = scoped_session(
                 sessionmaker(
                     query_cls=caching_query.query_callable(),
                     expire_on_commit=True,
                 )
           )
 
 # The declarative Base
 Base = declarative_base()