Merge branch 'master' of https://kallithea.rattailproject.org/rattail-project-contrib/sqlalchemy-pervasive

Author: chamilton-ccn

CHANGES.rst

@@ -4,6 +4,24 @@
 * Updated to work with python3
 
 
+0.2.1 (2021-03-03)
+------------------
+
+* Update author / homepage metadata.
+
+
+0.2.0 (2021-03-03)
+------------------
+
+* Officially declare "Python 3 only".
+
+
+0.1.3 (2018-02-24)
+------------------
+
+* Replace ``execfile()`` usage per python 3.
+
+
 0.1.2
 -----
 

setup.py

@@ -1,9 +1,8 @@
-#!/usr/bin/env python
-# -*- coding: utf-8  -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  sqlalchemy-pervasive -- SQLAlchemy Dialect for Pervasive PSQL
-#  Copyright © 2013 Sacramento Natural Foods Co-op, Inc
+#  Copyright © 2013-2021 Sacramento Natural Foods Co-op, Inc
 #
 #  This file is part of sqlalchemy-pervasive.
 #
@@ -22,13 +21,16 @@
 #
 ################################################################################
 
-
 import os.path
 from setuptools import setup, find_packages
 
 
 here = os.path.abspath(os.path.dirname(__file__))
+<<<<<<< HEAD
 exec(compile(open(os.path.join(here, 'sqlalchemy_pervasive', '_version.py')).read(), os.path.join(here, 'sqlalchemy_pervasive', '_version.py'), 'exec'))
+=======
+exec(open(os.path.join(here, 'sqlalchemy_pervasive', '_version.py')).read())
+>>>>>>> 3c1928b5b5693898f30e8b6e0ae4e6f57a5bf941
 
 README = open(os.path.join(here, 'README.rst')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
@@ -71,23 +73,23 @@
 setup(
     name = "sqlalchemy-pervasive",
     version = __version__,
-    author = "Sacramento Natural Foods Co-op, Inc",
-    author_email = "developer@sacfoodcoop.com",
-    url = 'https://github.com/SacNaturalFoods/sqlalchemy-pervasive',
+    author = "Lance Edgar",
+    author_email = "lance@edbob.org",
+    url = 'https://kallithea.rattailproject.org/rattail-project-contrib/sqlalchemy-pervasive',
     license = "GNU GPL v3",
     description = "SQLAlchemy Dialect for Pervasive PSQL",
     long_description = README + '\n\n' +  CHANGES,
 
     classifiers = [
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Topic :: Software Development :: Libraries :: Python Modules',
-        ],
+    ],
 
     install_requires = requires,
     packages = find_packages(exclude=['tests']),

sqlalchemy_pervasive/__init__.py

@@ -1,9 +1,8 @@
-#!/usr/bin/env python
-# -*- coding: utf-8  -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  sqlalchemy-pervasive -- SQLAlchemy Dialect for Pervasive PSQL
-#  Copyright © 2013 Sacramento Natural Foods Co-op, Inc
+#  Copyright © 2013-2021 Sacramento Natural Foods Co-op, Inc
 #
 #  This file is part of sqlalchemy-pervasive.
 #

sqlalchemy_pervasive/_version.py

@@ -1 +1,5 @@
+<<<<<<< HEAD
 __version__ = '0.1.3'
+=======
+__version__ = '0.2.1'
+>>>>>>> 3c1928b5b5693898f30e8b6e0ae4e6f57a5bf941

sqlalchemy_pervasive/base.py

@@ -1,9 +1,8 @@
-#!/usr/bin/env python
-# -*- coding: utf-8  -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  sqlalchemy-pervasive -- SQLAlchemy Dialect for Pervasive PSQL
-#  Copyright © 2013 Sacramento Natural Foods Co-op, Inc
+#  Copyright © 2013-2021 Sacramento Natural Foods Co-op, Inc
 #
 #  This file is part of sqlalchemy-pervasive.
 #
@@ -21,7 +20,6 @@
 #  sqlalchemy-pervasive.  If not, see <http://www.gnu.org/licenses/>.
 #
 ################################################################################
-
 """
 Support for the Pervasive PSQL database engine.
 """

sqlalchemy_pervasive/pyodbc.py

@@ -1,9 +1,8 @@
-#!/usr/bin/env python
-# -*- coding: utf-8  -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  sqlalchemy-pervasive -- SQLAlchemy Dialect for Pervasive PSQL
-#  Copyright © 2013 Sacramento Natural Foods Co-op, Inc
+#  Copyright © 2013-2021 Sacramento Natural Foods Co-op, Inc
 #
 #  This file is part of sqlalchemy-pervasive.
 #
@@ -21,7 +20,6 @@
 #  sqlalchemy-pervasive.  If not, see <http://www.gnu.org/licenses/>.
 #
 ################################################################################
-
 """
 Support for Pervasive PSQL via ``pyodbc``.
 """

fabfile.py renamed to tasks.py

@@ -1,9 +1,8 @@
-#!/usr/bin/env python
-# -*- coding: utf-8  -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  sqlalchemy-pervasive -- SQLAlchemy Dialect for Pervasive PSQL
-#  Copyright © 2013 Sacramento Natural Foods Co-op, Inc
+#  Copyright © 2013-2021 Sacramento Natural Foods Co-op, Inc
 #
 #  This file is part of sqlalchemy-pervasive.
 #
@@ -22,16 +21,21 @@
 #
 ################################################################################
 
-
+import os
 import shutil
-from fabric.api import task, local
+
+from invoke import task
+
+
+here = os.path.abspath(os.path.dirname(__file__))
+exec(open(os.path.join(here, 'sqlalchemy_pervasive', '_version.py')).read())
 
 
 @task
-def release():
+def release(ctx):
     """
     Release a new version of 'sqlalchemy-pervasive'.
     """
-
     shutil.rmtree('sqlalchemy_pervasive.egg-info')
-    local('python setup.py sdist --formats=gztar register upload')
+    ctx.run('python setup.py sdist --formats=gztar')
+    ctx.run('twine upload dist/sqlalchemy-pervasive-{}.tar.gz'.format(__version__))