Merge branch 'master' into query-logging

Author: dcwatson

.coveragerc

@@ -80,7 +80,7 @@ jobs:
  - uses: actions/setup-python@v4
  with:
  python-version: "3.x"
- - run: pip install cibuildwheel==2.10.2
+ - run: pip install cibuildwheel==2.13.1
  - id: set-matrix
  run: |
  MATRIX_INCLUDE=$(
@@ -118,13 +118,11 @@ jobs:
  if: runner.os == 'Linux'
  uses: docker/setup-qemu-action@v2
 
- - uses: pypa/cibuildwheel@v2.10.2
+ - uses: pypa/cibuildwheel@v2.13.1
  with:
  only: ${{ matrix.only }}
  env:
  CIBW_BUILD_VERBOSITY: 1
- CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
- CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
 
  - uses: actions/upload-artifact@v3
  with:
@@ -152,7 +150,7 @@ jobs:
 
  - name: Build docs
  run: |
- pip install -e .[dev]
+ pip install -e .[docs]
  make htmldocs
 
  - name: Checkout gh-pages

.github/workflows/release.yml

@@ -20,27 +20,26 @@ clean:
 
 
 compile:
-$(PYTHON) setup.py build_ext --inplace --cython-always
+env ASYNCPG_BUILD_CYTHON_ALWAYS=1 $(PYTHON) -m pip install -e .
 
 
 debug:
-ASYNCPG_DEBUG=1 $(PYTHON) setup.py build_ext --inplace
-
+env ASYNCPG_DEBUG=1 $(PYTHON) -m pip install -e .
 
 test:
-PYTHONASYNCIODEBUG=1 $(PYTHON) setup.py test
-$(PYTHON) setup.py test
-USE_UVLOOP=1 $(PYTHON) setup.py test
+PYTHONASYNCIODEBUG=1 $(PYTHON) -m unittest -v tests.suite
+$(PYTHON) -m unittest -v tests.suite
+USE_UVLOOP=1 $(PYTHON) -m unittest -v tests.suite
 
 
 testinstalled:
 cd "$${HOME}" && $(PYTHON) $(ROOT)/tests/__init__.py
 
 
 quicktest:
-$(PYTHON) setup.py test
+$(PYTHON) -m unittest -v tests.suite
 
 
 htmldocs:
-$(PYTHON) setup.py build_ext --inplace
+$(PYTHON) -m pip install -e .[docs]
 $(MAKE) -C docs html

Makefile

@@ -10,4 +10,4 @@
 # supported platforms, publish the packages on PyPI, merge the PR
 # to the target branch, create a Git tag pointing to the commit.
 
-__version__ = '0.28.0.dev0'
+__version__ = '0.28.0'

asyncpg/_version.py

@@ -611,21 +611,19 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user,
  'a Dict[str, str]')
 
  if target_session_attrs is None:
-
  target_session_attrs = os.getenv(
  "PGTARGETSESSIONATTRS", SessionAttribute.any
  )
  try:
-
  target_session_attrs = SessionAttribute(target_session_attrs)
- except ValueError as exc:
+ except ValueError:
  raise exceptions.InterfaceError(
  "target_session_attrs is expected to be one of "
  "{!r}"
  ", got {!r}".format(
  SessionAttribute.__members__.values, target_session_attrs
  )
- ) from exc
+ ) from None
 
  params = _ConnectionParameters(
  user=user, password=password, database=database, ssl=ssl,
@@ -1003,7 +1001,7 @@ async def _connect(*, loop, timeout, connection_class, record_class, **kwargs):
  chosen_connection = random.choice(candidates)
 
  await asyncio.gather(
- (c.close() for c in candidates if c is not chosen_connection),
+ *(c.close() for c in candidates if c is not chosen_connection),
  return_exceptions=True
  )
 

asyncpg/connect_utils.py

@@ -2054,18 +2054,19 @@ async def connect(dsn=None, *,
  :param SessionAttribute target_session_attrs:
  If specified, check that the host has the correct attribute.
  Can be one of:
- "any": the first successfully connected host
- "primary": the host must NOT be in hot standby mode
- "standby": the host must be in hot standby mode
- "read-write": the host must allow writes
- "read-only": the host most NOT allow writes
- "prefer-standby": first try to find a standby host, but if
- none of the listed hosts is a standby server,
- return any of them.
-
- If not specified will try to use PGTARGETSESSIONATTRS
- from the environment.
- Defaults to "any" if no value is set.
+
+ - ``"any"`` - the first successfully connected host
+ - ``"primary"`` - the host must NOT be in hot standby mode
+ - ``"standby"`` - the host must be in hot standby mode
+ - ``"read-write"`` - the host must allow writes
+ - ``"read-only"`` - the host most NOT allow writes
+ - ``"prefer-standby"`` - first try to find a standby host, but if
+ none of the listed hosts is a standby server,
+ return any of them.
+
+ If not specified, the value parsed from the *dsn* argument is used,
+ or the value of the ``PGTARGETSESSIONATTRS`` environment variable,
+ or ``"any"`` if neither is specified.
 
  :return: A :class:`~asyncpg.connection.Connection` instance.
 
@@ -2132,6 +2133,9 @@ async def connect(dsn=None, *,
  .. versionchanged:: 0.26.0
  Added the *direct_tls* parameter.
 
+ .. versionchanged:: 0.28.0
+ Added the *target_session_attrs* parameter.
+
  .. _SSLContext: https://docs.python.org/3/library/ssl.html#ssl.SSLContext
  .. _create_default_context:
  https://docs.python.org/3/library/ssl.html#ssl.create_default_context

asyncpg/connection.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-import alabaster
 import os
 import sys
 
@@ -39,7 +38,7 @@
 copyright = '2016-present, the asyncpg authors and contributors'
 author = '<See AUTHORS file>'
 release = version
-language = None
+language = "en"
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'
 todo_include_todos = False
@@ -48,12 +47,6 @@
 # -- Options for HTML output ----------------------------------------------
 
 html_theme = 'sphinx_rtd_theme'
-# html_theme_options = {
-# 'description': 'asyncpg is a fast PostgreSQL client library for the '
-# 'Python asyncio framework',
-# 'show_powered_by': False,
-# }
-html_theme_path = [alabaster.get_path()]
 html_title = 'asyncpg Documentation'
 html_short_title = 'asyncpg'
 html_static_path = ['_static']
@@ -66,11 +59,6 @@
 html_show_sourcelink = False
 html_show_sphinx = False
 html_show_copyright = True
-html_context = {
- 'css_files': [
- '_static/theme_overrides.css',
- ],
-}
 htmlhelp_basename = 'asyncpgdoc'
 
 

docs/conf.py

@@ -1,5 +1,6 @@
-.. image:: https://travis-ci.org/MagicStack/asyncpg.svg?branch=master
- :target: https://travis-ci.org/MagicStack/asyncpg
+.. image:: https://github.com/MagicStack/asyncpg/workflows/Tests/badge.svg
+ :target: https://github.com/MagicStack/asyncpg/actions?query=workflow%3ATests+branch%3Amaster
+ :alt: GitHub Actions status
 
 .. image:: https://img.shields.io/pypi/status/asyncpg.svg?maxAge=2592000?style=plastic
  :target: https://pypi.python.org/pypi/asyncpg

docs/index.rst

@@ -1,7 +1,68 @@
+[project]
+name = "asyncpg"
+description = "An asyncio PostgreSQL driver"
+authors = [{name = "MagicStack Inc", email = "hello@magic.io"}]
+requires-python = '>=3.7.0'
+readme = "README.rst"
+license = {text = "Apache License, Version 2.0"}
+dynamic = ["version"]
+keywords = [
+ "database",
+ "postgres",
+]
+classifiers = [
+ "Development Status :: 5 - Production/Stable",
+ "Framework :: AsyncIO",
+ "Intended Audience :: Developers",
+ "License :: OSI Approved :: Apache Software License",
+ "Operating System :: POSIX",
+ "Operating System :: MacOS :: MacOS X",
+ "Operating System :: Microsoft :: Windows",
+ "Programming Language :: Python :: 3 :: Only",
+ "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 :: Implementation :: CPython",
+ "Topic :: Database :: Front-Ends",
+]
+dependencies = [
+ 'typing-extensions>=3.7.4.3;python_version<"3.8"',
+]
+
+[project.urls]
+github = "https://github.com/MagicStack/asyncpg"
+
+[project.optional-dependencies]
+test = [
+ 'flake8~=5.0',
+ 'uvloop>=0.15.3; platform_system != "Windows"',
+]
+docs = [
+ 'Sphinx~=5.3.0',
+ 'sphinxcontrib-asyncio~=0.3.0',
+ 'sphinx_rtd_theme>=1.2.2',
+]
+
 [build-system]
-requires = ["setuptools>=42", "wheel"]
+requires = [
+ "setuptools>=60",
+ "wheel",
+
+ "Cython(>=0.29.24,<0.30.0)"
+]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools]
+zip-safe = false
+
+[tool.setuptools.packages.find]
+include = ["asyncpg", "asyncpg.*"]
+
+[tool.setuptools.exclude-package-data]
+"*" = ["*.c", "*.h"]
+
 [tool.cibuildwheel]
 build-frontend = "build"
 test-extras = "test"
@@ -19,3 +80,25 @@ test-command = """\
  && chmod -R go+rX "$(dirname $(dirname $(dirname $PY)))" \
  && su -l apgtest -c "$PY {project}/tests/__init__.py" \
  """
+
+[tool.pytest.ini_options]
+addopts = "--capture=no --assert=plain --strict-markers --tb=native --import-mode=importlib"
+testpaths = "tests"
+filterwarnings = "default"
+
+[tool.coverage.run]
+branch = true
+plugins = ["Cython.Coverage"]
+parallel = true
+source = ["asyncpg/", "tests/"]
+omit = ["*.pxd"]
+
+[tool.coverage.report]
+exclude_lines = [
+ "pragma: no cover",
+ "def __repr__",
+ "if debug",
+ "raise NotImplementedError",
+ "if __name__ == .__main__.",
+]
+show_missing = true