kvesteri
diff --git a/Diff for: ‎.ci/install_mssql.sh
+9 b/Diff for: ‎.ci/install_mssql.sh
+9
diff --git a/Diff for: ‎.github/workflows/lint.yaml
+18 b/Diff for: ‎.github/workflows/lint.yaml
+18
diff --git a/Diff for: ‎.github/workflows/test.yaml
+68 b/Diff for: ‎.github/workflows/test.yaml
+68
diff --git a/Diff for: ‎.gitignore
+1 b/Diff for: ‎.gitignore
+1
diff --git a/Diff for: ‎.isort.cfg
-1 b/Diff for: ‎.isort.cfg
-1
diff --git a/Diff for: ‎.travis.yml
-40 b/Diff for: ‎.travis.yml
-40
diff --git a/Diff for: ‎.travis/install_mssql.sh
-23 b/Diff for: ‎.travis/install_mssql.sh
-23
diff --git a/Diff for: ‎conftest.py
+15-5 b/Diff for: ‎conftest.py
+15-5
diff --git a/Diff for: ‎docs/conf.py
+2-1 b/Diff for: ‎docs/conf.py
+2-1
diff --git a/Diff for: ‎setup.cfg
+9 b/Diff for: ‎setup.cfg
+9
diff --git a/Diff for: ‎setup.py
+3-3 b/Diff for: ‎setup.py
+3-3
diff --git a/Diff for: ‎sqlalchemy_utils/__init__.py
+1-2 b/Diff for: ‎sqlalchemy_utils/__init__.py
+1-2
diff --git a/Diff for: ‎sqlalchemy_utils/aggregates.py
+2-1 b/Diff for: ‎sqlalchemy_utils/aggregates.py
+2-1
diff --git a/Diff for: ‎sqlalchemy_utils/compat.py
+5 b/Diff for: ‎sqlalchemy_utils/compat.py
+5
diff --git a/Diff for: ‎sqlalchemy_utils/functions/__init__.py
+1-6 b/Diff for: ‎sqlalchemy_utils/functions/__init__.py
+1-6
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ ! -f /etc/apt/sources.list.d/microsoft-prod.list ]; then
+    curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
+    sudo sh -c "curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -r -s)/prod.list > /etc/apt/sources.list.d/mssql-release.list"
+fi
+
+sudo apt-get update
+sudo ACCEPT_EULA=Y apt-get -y install msodbcsql17 unixodbc
@@ -0,0 +1,18 @@
+name: Python linting
+on: [push, pull_request]
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.6', '3.9']
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install tox
+        run: pip install tox
+      - name: Run linting
+        run: tox -e lint
@@ -0,0 +1,68 @@
+name: Tests
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9']
+        tox_env: ['sqlalchemy14']
+        include:
+          - python-version: '3.6'
+            tox_env: 'sqlalchemy13'
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: sqlalchemy_utils_test
+        # Set health checks to wait until PostgreSQL has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+      mysql:
+        image: mysql:latest
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: sqlalchemy_utils_test
+        ports:
+          - 3306:3306
+      mssql:
+        image: mcr.microsoft.com/mssql/server:2017-latest
+        env:
+          ACCEPT_EULA: Y
+          SA_PASSWORD: Strong_Passw0rd
+        # Set health checks to wait until SQL Server has started
+        options: >-
+          --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -Q 'SELECT 1;' -b"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 1433:1433
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install MS SQL stuff
+        run: bash .ci/install_mssql.sh
+      - name: Add hstore extension to the sqlalchemy_utils_test database
+        env:
+          PGHOST: localhost
+          PGPASSWORD: postgres
+          PGPORT: 5432
+        run: psql -U postgres -d sqlalchemy_utils_test -c 'CREATE EXTENSION hstore;'
+      - name: Install tox
+        run: pip install tox
+      - name: Run tests
+        env:
+          SQLALCHEMY_UTILS_TEST_POSTGRESQL_PASSWORD: postgres
+        run: tox -e ${{matrix.tox_env }}
@@ -27,6 +27,7 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
+coverage.xml
 nosetests.xml
 
 # Translations
 
@@ -3,5 +3,4 @@ known_first_party=sqlalchemy_utils
 known_third_party=flexmock
 line_length=79
 multi_line_output=3
-not_skip=__init__.py
 order_by_type=false
@@ -8,13 +8,14 @@
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm.session import close_all_sessions
+
 from sqlalchemy_utils import (
     aggregates,
     coercion_listener,
     i18n,
     InstrumentedList
 )
-
+from sqlalchemy_utils.functions.orm import _get_class_registry
 from sqlalchemy_utils.types.pg_composite import remove_composite_listeners
 
 
@@ -48,14 +49,23 @@ def postgresql_db_user():
     return os.environ.get('SQLALCHEMY_UTILS_TEST_POSTGRESQL_USER', 'postgres')
 
 
+@pytest.fixture(scope='session')
+def postgresql_db_password():
+    return os.environ.get('SQLALCHEMY_UTILS_TEST_POSTGRESQL_PASSWORD', '')
+
+
 @pytest.fixture(scope='session')
 def mysql_db_user():
     return os.environ.get('SQLALCHEMY_UTILS_TEST_MYSQL_USER', 'root')
 
 
 @pytest.fixture
-def postgresql_dsn(postgresql_db_user, db_name):
-    return 'postgresql://{0}@localhost/{1}'.format(postgresql_db_user, db_name)
+def postgresql_dsn(postgresql_db_user, postgresql_db_password, db_name):
+    return 'postgresql://{0}:{1}@localhost/{2}'.format(
+        postgresql_db_user,
+        postgresql_db_password,
+        db_name
+    )
 
 
 @pytest.fixture
@@ -86,7 +96,7 @@ def mssql_db_user():
 @pytest.fixture
 def mssql_db_password():
     return os.environ.get('SQLALCHEMY_UTILS_TEST_MSSQL_PASSWORD',
-                          'Strong!Passw0rd')
+                          'Strong_Passw0rd')
 
 
 @pytest.fixture
@@ -166,7 +176,7 @@ def articles_count(self):
 
         @articles_count.expression
         def articles_count(cls):
-            Article = Base._decl_class_registry['Article']
+            Article = _get_class_registry(Base)['Article']
             return (
                 sa.select([sa.func.count(Article.id)])
                 .where(Article.category_id == cls.id)
 
@@ -11,7 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 
@@ -1,2 +1,11 @@
 [bdist_wheel]
 universal = 1
+
+[flake8]
+exclude =
+    .eggs
+    .git
+    .tox
+    .venv
+    build
+    docs/conf.py
@@ -4,11 +4,11 @@
 
 Various utility functions and custom data types for SQLAlchemy.
 """
-from setuptools import setup, find_packages
 import os
 import re
 import sys
 
+from setuptools import find_packages, setup
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 PY3 = sys.version_info[0] == 3
@@ -58,9 +58,9 @@ def get_version():
 
 # Add all optional dependencies to testing requirements.
 test_all = []
-for name, requirements in sorted(extras_require.items()):
+for requirements in extras_require.values():
     test_all += requirements
-extras_require['test_all'] = test_all
+extras_require['test_all'] = sorted(test_all)
 
 
 setup(
 
@@ -25,7 +25,6 @@
     get_hybrid_properties,
     get_mapper,
     get_primary_keys,
-    get_query_entities,
     get_referencing_foreign_keys,
     get_tables,
     get_type,
@@ -42,7 +41,6 @@
     naturally_equivalent,
     render_expression,
     render_statement,
-    sort_query,
     table_name
 )
 from .generic import generic_relationship  # noqa
@@ -91,6 +89,7 @@
     remove_composite_listeners,
     ScalarListException,
     ScalarListType,
+    StringEncryptedType,
     TimezoneType,
     TSVectorType,
     URLType,
 
@@ -369,6 +369,7 @@ class Rating(Base):
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.sql.functions import _FunctionGenerator
 
+from .compat import get_scalar_subquery
 from .functions.orm import get_column_key
 from .relationships import (
     chained_join,
@@ -452,7 +453,7 @@ def aggregate_query(self):
             self.relationships[0].mapper.class_
         )
 
-        return query.as_scalar()
+        return get_scalar_subquery(query)
 
     def update_query(self, objects):
         table = self.class_.__table__
 
@@ -0,0 +1,5 @@
+def get_scalar_subquery(query):
+    try:
+        return query.scalar_subquery()
+    except AttributeError:  # SQLAlchemy <1.4
+        return query.as_scalar()
@@ -28,7 +28,6 @@
     get_hybrid_properties,
     get_mapper,
     get_primary_keys,
-    get_query_entities,
     get_tables,
     get_type,
     getdotattr,
@@ -40,8 +39,4 @@
     table_name
 )
 from .render import render_expression, render_statement  # noqa
-from .sort_query import (  # noqa
-    make_order_by_deterministic,
-    QuerySorterException,
-    sort_query
-)
+from .sort_query import make_order_by_deterministic  # noqa