engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dbmigrate: remove six

Browse source
This commit is contained in:
RhodeCode Admin 2023-08-29 09:59:31 +02:00
parent d59ee724df
commit 0d4b65e34f
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/lib/dbmigrate/migrate/__init__.py
View file

@ -8,4 +8,4 @@
from rhodecode.lib.dbmigrate.migrate.versioning import *
from rhodecode.lib.dbmigrate.migrate.changeset import *
__version__ = '0.7.3.dev'
__version__ = '0.11.0'

12
rhodecode/lib/dbmigrate/migrate/changeset/__init__.py
View file

@ -10,9 +10,9 @@ import warnings
import sqlalchemy
from sqlalchemy import __version__ as _sa_version
warnings.simplefilter('always', DeprecationWarning)
warnings.simplefilter("always", DeprecationWarning)
_sa_version = tuple(int(re.match("\d+", x).group(0)) for x in _sa_version.split("."))
_sa_version = tuple(int(re.match(r"\d+", x).group(0)) for x in _sa_version.split("."))
SQLA_07 = _sa_version >= (0, 7)
SQLA_08 = _sa_version >= (0, 8)
SQLA_09 = _sa_version >= (0, 9)
@ -24,8 +24,8 @@ del _sa_version
from rhodecode.lib.dbmigrate.migrate.changeset.schema import *
from rhodecode.lib.dbmigrate.migrate.changeset.constraint import *
sqlalchemy.schema.Table.__bases__ += (ChangesetTable, )
sqlalchemy.schema.Column.__bases__ += (ChangesetColumn, )
sqlalchemy.schema.Index.__bases__ += (ChangesetIndex, )
sqlalchemy.schema.Table.__bases__ += (ChangesetTable,)
sqlalchemy.schema.Column.__bases__ += (ChangesetColumn,)
sqlalchemy.schema.Index.__bases__ += (ChangesetIndex,)
sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause, )
sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause,)

3
rhodecode/lib/dbmigrate/migrate/changeset/schema.py
View file

@ -33,6 +33,7 @@ __all__ = [
'ColumnDelta',
]
def create_column(column, table=None, *p, **kw):
"""Create a column, given the table.
@ -198,7 +199,7 @@ class MyMeta(sqlalchemy.sql.visitors.VisitableType, abc.ABCMeta, object):
pass
class ColumnDelta(six.with_metaclass(MyMeta, DictMixin, sqlalchemy.schema.SchemaItem)):
class ColumnDelta(DictMixin, sqlalchemy.schema.SchemaItem, metaclass=MyMeta):
"""Extracts the differences between two columns/column-parameters
May receive parameters arranged in several different ways: