Binding DB sessions based on SQLAlchemy 1, changing how to declare Base Model classes, and other code modernization

.pre-commit-config.yaml

@@ -0,0 +1,37 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.5.0
+ hooks:
+ - id: check-merge-conflict
+ - id: debug-statements
+ - id: mixed-line-ending
+ args: [--fix=lf]
+- repo: https://github.com/pycqa/isort
+ rev: 5.13.2
+ hooks:
+ - id: isort
+ args: [--profile=black]
+- repo: https://github.com/asottile/pyupgrade
+ rev: v3.15.1
+ hooks:
+ - id: pyupgrade
+ args: [--py36-plus]
+- repo: https://github.com/psf/black
+ rev: 24.2.0
+ hooks:
+ - id: black
+- repo: https://github.com/PyCQA/flake8
+ rev: 7.0.0
+ hooks:
+ - id: flake8
+- repo: meta
+ hooks:
+ - id: check-hooks-apply
+ - id: check-useless-excludes
+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+ rev: v2.12.0
+ hooks:
+ - id: pretty-format-yaml
+ args: [--autofix, --indent, '2']

.travis.yml

@@ -2,31 +2,31 @@ language: python
 sudo: false
 env:
  global:
-  - REQUIREMENTS=requirements.txt
-  - TEST_REQUIREMENTS=social/tests/requirements.txt
+ - REQUIREMENTS=requirements.txt
+ - TEST_REQUIREMENTS=social/tests/requirements.txt
 python:
- - "2.7"
+- '2.7'
 matrix:
  include:
-  - python: "pypy"
-  env:
-  - TEST_REQUIREMENTS=social/tests/requirements-pypy.txt
-  - python: "3.3"
-  env:
-  - REQUIREMENTS=requirements-python3.txt
-  - TEST_REQUIREMENTS=social/tests/requirements-python3.txt
-  - python: "3.4"
-  env:
-  - REQUIREMENTS=requirements-python3.txt
-  - TEST_REQUIREMENTS=social/tests/requirements-python3.txt
+ - python: pypy
+ env:
+ - TEST_REQUIREMENTS=social/tests/requirements-pypy.txt
+ - python: '3.3'
+ env:
+ - REQUIREMENTS=requirements-python3.txt
+ - TEST_REQUIREMENTS=social/tests/requirements-python3.txt
+ - python: '3.4'
+ env:
+ - REQUIREMENTS=requirements-python3.txt
+ - TEST_REQUIREMENTS=social/tests/requirements-python3.txt
 addons:
  apt:
  packages:
-  - libxmlsec1-dev
-  - swig
+ - libxmlsec1-dev
+ - swig
 install:
- - "python setup.py -q install"
- - "travis_retry pip install -r $REQUIREMENTS"
- - "travis_retry pip install -r $TEST_REQUIREMENTS"
+- python setup.py -q install
+- travis_retry pip install -r $REQUIREMENTS
+- travis_retry pip install -r $TEST_REQUIREMENTS
 script:
- - "nosetests --with-coverage --cover-package=social --where=social/tests"
+- nosetests --with-coverage --cover-package=social --where=social/tests

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased](https://github.com/python-social-auth/social-app-webpy/commits/master)
 
+### Changed
+- Modified model and access code to work with SQLAlchemy version 2 (Issue #1)
+- Updated packaging information files per PEP 517, PEP 518 (Issue #2)
+- Restricted Python minimum working version to 3.7 or higher to align with SQLAlchemy 2 (Issue #1)
+- Fixed behavior of get_current_user function throwing a None error when executed (Issue #3)
+
 ## [1.0.0](https://github.com/python-social-auth/social-app-webpy/releases/tag/1.0.0) - 2017-01-22
 
 ### Added

Makefile

@@ -1,12 +1,8 @@
 build:
- @ python setup.py sdist
- @ python setup.py bdist_wheel --python-tag py2
- @ BUILD_VERSION=3 python setup.py bdist_wheel --python-tag py3
+ @ python -m build
 
 publish:
- @ python setup.py sdist upload
- @ python setup.py bdist_wheel --python-tag py2 upload
- @ BUILD_VERSION=3 python setup.py bdist_wheel --python-tag py3 upload
+ @ twine upload dist/*
 
 clean:
  @ find . -name '*.py[co]' -delete

pyproject.toml

@@ -0,0 +1,58 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = 'social-auth-app-webpy'
+dynamic = ["version"]
+dependencies = [
+ "six",
+ "social-auth-core>=1.0.0",
+ "social-auth-storage-sqlalchemy>=1.0.0",
+]
+authors = [
+ {name = "Matias Aguirre", email = "[email protected]"},
+ {name = "Lee Ji-ho", email = "[email protected]"},
+]
+description = 'Python Social Authentication, web.py integration.'
+license = {text = 'BSD'}
+keywords = ["web.py", "sqlalchemy", "social auth"]
+readme = "README.md"
+classifiers=[
+ 'Development Status :: 4 - Beta',
+ 'Topic :: Internet',
+ 'License :: OSI Approved :: BSD License',
+ 'Intended Audience :: Developers',
+ 'Environment :: Web Environment',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
+ 'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: 3.11',
+ 'Programming Language :: Python :: 3.12'
+]
+requires-python = ">= 3.7"
+
+[project.urls]
+Repository = 'https://github.com/python-social-auth/social-app-webpy'
+Documentation = 'http://python-social-auth.readthedocs.org'
+Issues = 'https://github.com/python-social-auth/social-app-webpy/issues'
+Changelog = 'https://github.com/python-social-auth/social-app-webpy/blob/master/CHANGELOG.md'
+
+[options]
+zip_safe = false
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages]
+find = {}
+
+[tool.setuptools.dynamic]
+version = {attr = "social_webpy.__version__"}
+
+[tool.flake8]
+max-line-length = 79
+# Ignore some well known paths
+exclude = ['.venv','.tox','dist','doc','build','*.egg','db/env.py','db/versions/*.py','site','Pipfile','Pipfile.lock']

social_webpy/__init__.py

@@ -1 +1 @@
-__version__ = '1.0.0'
+__version__ = "1.0.0"

social_webpy/app.py

@@ -1,41 +1,42 @@
 import web
-
 from social_core.actions import do_auth, do_complete, do_disconnect
 
-from .utils import psa, load_strategy, load_strategy
-
+from .utils import load_strategy, psa
 
 urls = (
- r'/login/(?P<backend>[^/]+)/?', 'auth',
- r'/complete/(?P<backend>[^/]+)/?', 'complete',
- r'/disconnect/(?P<backend>[^/]+)/?', 'disconnect',
- r'/disconnect/(?P<backend>[^/]+)/(?P<association_id>\d+)/?', 'disconnect',
+ r"/login/(?P<backend>[^/]+)/?",
+ "auth",
+ r"/complete/(?P<backend>[^/]+)/?",
+ "complete",
+ r"/disconnect/(?P<backend>[^/]+)/?",
+ "disconnect",
+ r"/disconnect/(?P<backend>[^/]+)/(?P<association_id>\d+)/?",
+ "disconnect",
 )
 
 
-class BaseViewClass(object):
+class BaseViewClass:
  def __init__(self, *args, **kwargs):
  self.session = web.web_session
- method = web.ctx.method == 'POST' and 'post' or 'get'
+ method = web.ctx.method == "POST" and "post" or "get"
  self.strategy = load_strategy()
  self.data = web.input(_method=method)
  self.backend = None
- self._user = None
- super(BaseViewClass, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
 
  def get_current_user(self):
- if not hasattr(self, '_user'):
- if self.session.get('logged_in'):
- self._user = self.strategy.get_user(
- self.session.get('user_id')
+ if not hasattr(self, "_user"):
+ if self.session.get("logged_in"):
+ self._user = self.strategy.get_user( # fmt: skip
+ self.session.get("user_id")
  )
  else:
  self._user = None
  return self._user
 
  def login_user(self, user):
- self.session['logged_in'] = True
- self.session['user_id'] = user.id
+ self.session["logged_in"] = True
+ self.session["user_id"] = user.id
 
 
 class auth(BaseViewClass):
@@ -45,7 +46,7 @@ def GET(self, backend):
  def POST(self, backend):
  return self._auth(backend)
 
- @psa('/complete/%(backend)s/')
+ @psa("/complete/%(backend)s/")
  def _auth(self, backend):
  return do_auth(self.backend)
 
@@ -57,20 +58,23 @@ def GET(self, backend, *args, **kwargs):
  def POST(self, backend, *args, **kwargs):
  return self._complete(backend, *args, **kwargs)
 
- @psa('/complete/%(backend)s/')
+ @psa("/complete/%(backend)s/")
  def _complete(self, backend, *args, **kwargs):
  return do_complete(
  self.backend,
  login=lambda backend, user, social_user: self.login_user(user),
- user=self.get_current_user(), *args, **kwargs
+ user=self.get_current_user(),
+ *args,
+ **kwargs,
  )
 
 
 class disconnect(BaseViewClass):
  @psa()
  def POST(self, backend, association_id=None):
- return do_disconnect(self.backend, self.get_current_user(),
- association_id)
+ return do_disconnect( # fmt: skip
+ self.backend, self.get_current_user(), association_id
+ )
 
 
 app_social = web.application(urls, locals())