Require SQLAlchemy 1.4.x
This commit is contained in:
		
							parent
							
								
									2444628c13
								
							
						
					
					
						commit
						ad5837405f
					
				
					 5 changed files with 13 additions and 20 deletions
				
			
		| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
################################################################################
 | 
			
		||||
#
 | 
			
		||||
#  pyCOREPOS -- Python Interface to CORE POS
 | 
			
		||||
#  Copyright © 2018-2021 Lance Edgar
 | 
			
		||||
#  Copyright © 2018-2023 Lance Edgar
 | 
			
		||||
#
 | 
			
		||||
#  This file is part of pyCOREPOS.
 | 
			
		||||
#
 | 
			
		||||
| 
						 | 
				
			
			@ -25,11 +25,10 @@ Data model for CORE POS "lane_op" DB
 | 
			
		|||
"""
 | 
			
		||||
 | 
			
		||||
import sqlalchemy as sa
 | 
			
		||||
# from sqlalchemy import orm
 | 
			
		||||
from sqlalchemy.ext.declarative import declarative_base
 | 
			
		||||
from sqlalchemy import orm
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Base = declarative_base()
 | 
			
		||||
Base = orm.declarative_base()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Department(Base):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
################################################################################
 | 
			
		||||
#
 | 
			
		||||
#  pyCOREPOS -- Python Interface to CORE POS
 | 
			
		||||
#  Copyright © 2018-2021 Lance Edgar
 | 
			
		||||
#  Copyright © 2018-2023 Lance Edgar
 | 
			
		||||
#
 | 
			
		||||
#  This file is part of pyCOREPOS.
 | 
			
		||||
#
 | 
			
		||||
| 
						 | 
				
			
			@ -29,13 +29,12 @@ import logging
 | 
			
		|||
 | 
			
		||||
import sqlalchemy as sa
 | 
			
		||||
from sqlalchemy import orm
 | 
			
		||||
from sqlalchemy.ext.declarative import declarative_base
 | 
			
		||||
from sqlalchemy.ext.associationproxy import association_proxy
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
log = logging.getLogger(__name__)
 | 
			
		||||
 | 
			
		||||
Base = declarative_base()
 | 
			
		||||
Base = orm.declarative_base()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class StringableDateTime(sa.TypeDecorator):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
################################################################################
 | 
			
		||||
#
 | 
			
		||||
#  pyCOREPOS -- Python Interface to CORE POS
 | 
			
		||||
#  Copyright © 2018-2020 Lance Edgar
 | 
			
		||||
#  Copyright © 2018-2023 Lance Edgar
 | 
			
		||||
#
 | 
			
		||||
#  This file is part of pyCOREPOS.
 | 
			
		||||
#
 | 
			
		||||
| 
						 | 
				
			
			@ -24,17 +24,13 @@
 | 
			
		|||
CORE POS Transaction Data Model
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
from __future__ import unicode_literals, absolute_import
 | 
			
		||||
 | 
			
		||||
import six
 | 
			
		||||
import sqlalchemy as sa
 | 
			
		||||
from sqlalchemy.ext.declarative import declarative_base
 | 
			
		||||
from sqlalchemy import orm
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Base = declarative_base()
 | 
			
		||||
Base = orm.declarative_base()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@six.python_2_unicode_compatible
 | 
			
		||||
class TransactionDetailBase(object):
 | 
			
		||||
    """
 | 
			
		||||
    Represents a POS transaction detail record.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
################################################################################
 | 
			
		||||
#
 | 
			
		||||
#  pyCOREPOS -- Python Interface to CORE POS
 | 
			
		||||
#  Copyright © 2018-2022 Lance Edgar
 | 
			
		||||
#  Copyright © 2018-2023 Lance Edgar
 | 
			
		||||
#
 | 
			
		||||
#  This file is part of pyCOREPOS.
 | 
			
		||||
#
 | 
			
		||||
| 
						 | 
				
			
			@ -24,12 +24,12 @@
 | 
			
		|||
CORE POS Transaction Data Model
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
from sqlalchemy.ext.declarative import declarative_base
 | 
			
		||||
from sqlalchemy import orm
 | 
			
		||||
 | 
			
		||||
from corepos.db.office_trans.model import TransactionDetailBase
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Base = declarative_base()
 | 
			
		||||
Base = orm.declarative_base()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class TransactionDetail(TransactionDetailBase, Base):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										5
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										5
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
################################################################################
 | 
			
		||||
#
 | 
			
		||||
#  pyCOREPOS -- Python Interface to CORE POS
 | 
			
		||||
#  Copyright © 2018-2020 Lance Edgar
 | 
			
		||||
#  Copyright © 2018-2023 Lance Edgar
 | 
			
		||||
#
 | 
			
		||||
#  This file is part of pyCOREPOS.
 | 
			
		||||
#
 | 
			
		||||
| 
						 | 
				
			
			@ -63,7 +63,7 @@ requires = [
 | 
			
		|||
    'mysql-connector-python',           # 8.0.6
 | 
			
		||||
    'requests',                         # 2.23.0
 | 
			
		||||
    'six',                              # 1.12.0
 | 
			
		||||
    'SQLAlchemy',                       # 0.9.8
 | 
			
		||||
    'SQLAlchemy>=1.4',                  # 1.4.0
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -87,7 +87,6 @@ setup(
 | 
			
		|||
        'Operating System :: OS Independent',
 | 
			
		||||
        'Programming Language :: Python',
 | 
			
		||||
        'Programming Language :: Python :: 3',
 | 
			
		||||
        'Programming Language :: Python :: 3.5',
 | 
			
		||||
        'Topic :: Office/Business',
 | 
			
		||||
        'Topic :: Software Development :: Libraries :: Python Modules',
 | 
			
		||||
    ],
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue