From 67e3782dc540ee13858027c3521691e779fcdc16 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Tue, 9 Nov 2021 09:09:07 +0200 Subject: [PATCH 1/7] Switch from setup.py to declarative setup.cfg (#375) --- README.rst | 4 +-- pyproject.toml | 3 ++ setup.cfg | 51 ++++++++++++++++++++++++++++ setup.py | 90 ++------------------------------------------------ 4 files changed, 58 insertions(+), 90 deletions(-) create mode 100644 pyproject.toml diff --git a/README.rst b/README.rst index 8527649..54a7c00 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,8 @@ ======= janus ======= -.. image:: https://travis-ci.com/aio-libs/janus.svg?branch=master - :target: https://travis-ci.com/aio-libs/janus +.. image:: https://github.com/aio-libs/janus/actions/workflows/ci.yml/badge.svg + :target: https://github.com/aio-libs/janus/actions/workflows/ci.yml .. image:: https://codecov.io/gh/aio-libs/janus/branch/master/graph/badge.svg :target: https://codecov.io/gh/aio-libs/janus .. image:: https://img.shields.io/pypi/v/janus.svg diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..617caea --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools>=51", "wheel>=0.36"] +build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index 3de04f7..829f520 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,54 @@ +[metadata] +name = janus +version = attr: janus.__version__ +url = https://github.com/aio-libs/janus +project_urls = + Chat: Gitter = https://gitter.im/aio-libs/Lobby + CI: GitHub Actions = https://github.com/aio-libs/janus/actions/workflows/ci.yml + Coverage: codecov = https://codecov.io/github/aio-libs/janus + GitHub: issues = https://github.com/aio-libs/janus/issues + GitHub: repo = https://github.com/aio-libs/janus +description = Mixed sync-async queue to interoperate between asyncio tasks and classic threads +long_description = file: README.rst +long_description_content_type = text/x-rst +author = Andrew Svetlov +author_email = andrew.svetlov@gmail.com +license = Apache 2 +license_files = LICENSE.txt +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 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + + Topic :: Software Development :: Libraries + +keywords= janus, queue, asyncio + +[options] +python_requires = >=3.6 +packages = find: +# https://setuptools.readthedocs.io/en/latest/setuptools.html#setting-the-zip-safe-flag +zip_safe = True +include_package_data = True + +install_requires = + [flake8] exclude = .git,.env,__pycache__,.eggs max-line-length = 88 diff --git a/setup.py b/setup.py index dd7dedd..8bf1ba9 100644 --- a/setup.py +++ b/setup.py @@ -1,88 +1,2 @@ -import codecs -import os -import re -import sys - -from setuptools import find_packages, setup -from setuptools.command.test import test as TestCommand - - -class PyTest(TestCommand): - user_options = [("pytest-args=", "a", "Arguments to pass to py.test")] - - def initialize_options(self): - TestCommand.initialize_options(self) - self.pytest_args = [] - - def finalize_options(self): - TestCommand.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - # import here, cause outside the eggs aren't loaded - import pytest - - errno = pytest.main(self.pytest_args) - sys.exit(errno) - - -with codecs.open( - os.path.join(os.path.abspath(os.path.dirname(__file__)), "janus", "__init__.py"), - "r", - "latin1", -) as fp: - try: - version = re.findall(r'^__version__ = "([^"]+)"$', fp.read(), re.M)[0] - except IndexError: - raise RuntimeError("Unable to determine version.") - - -def read(f): - return open(os.path.join(os.path.dirname(__file__), f)).read().strip() - - -install_requires = [] - -tests_require = install_requires + [ - "pytest>=5.4", - "pytest-asyncio>=0.10.0", -] -extras_require = {} - - -setup( - name="janus", - version=version, - description=( - "Mixed sync-async queue to interoperate between " - "asyncio tasks and classic threads" - ), - long_description="\n\n".join((read("README.rst"), read("CHANGES.rst"))), - classifiers=[ - "License :: OSI Approved :: Apache Software License", - "Intended Audience :: Developers", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Topic :: Software Development :: Libraries", - "Framework :: AsyncIO", - ], - author="Andrew Svetlov", - author_email="andrew.svetlov@gmail.com", - url="https://github.com/aio-libs/janus/", - license="Apache 2", - packages=find_packages(), - python_requires=">=3.6", - install_requires=install_requires, - tests_require=tests_require, - cmdclass={"test": PyTest}, - include_package_data=True, - zip_safe=True, - keywords=["janus", "queue", "asyncio"], - extras_require=extras_require, -) +from setuptools import setup +setup() From 7ff20afb10149c2d020c388e81a22ed715149914 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 04:27:26 +0000 Subject: [PATCH 2/7] Bump isort from 5.10.0 to 5.10.1 (#376) Bumps [isort](https://github.com/pycqa/isort) from 5.10.0 to 5.10.1. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.10.0...5.10.1) --- updated-dependencies: - dependency-name: isort dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index bdc11be..5c4baa9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -9,6 +9,6 @@ pyroma==3.2 pytest-cov==3.0.0 pytest==6.2.5 pytest-asyncio==0.16.0 -isort==5.10.0 +isort==5.10.1 tox==3.24.4 wheel==0.37.0 From e21eec2c04acfba189f7177d2981e24fc3674fd1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 04:33:51 +0000 Subject: [PATCH 3/7] Bump coverage from 6.1.1 to 6.1.2 (#377) Bumps [coverage](https://github.com/nedbat/coveragepy) from 6.1.1 to 6.1.2. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.1.1...6.1.2) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 5c4baa9..1609fee 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ -e . black==21.10b0 bandit==1.7.0 -coverage==6.1.1 +coverage==6.1.2 docutils==0.18 flake8==4.0.1 mypy==0.910 From 4d625a2138ef85ca964b6a776472d19a92334433 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 04:26:45 +0000 Subject: [PATCH 4/7] Bump bandit from 1.7.0 to 1.7.1 (#378) Bumps [bandit](https://github.com/PyCQA/bandit) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/PyCQA/bandit/releases) - [Commits](https://github.com/PyCQA/bandit/compare/1.7.0...1.7.1) --- updated-dependencies: - dependency-name: bandit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1609fee..96054af 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ -e . black==21.10b0 -bandit==1.7.0 +bandit==1.7.1 coverage==6.1.2 docutils==0.18 flake8==4.0.1 From 967c28426d509671e8f18327848046f7413805f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 04:23:23 +0000 Subject: [PATCH 5/7] Bump black from 21.10b0 to 21.11b0 (#379) Bumps [black](https://github.com/psf/black) from 21.10b0 to 21.11b0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/commits) --- updated-dependencies: - dependency-name: black dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 96054af..882341a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ -e . -black==21.10b0 +black==21.11b0 bandit==1.7.1 coverage==6.1.2 docutils==0.18 From 76ccc92890e4fa28966a1b3fe873fc360a2a70e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 04:33:24 +0000 Subject: [PATCH 6/7] Bump black from 21.11b0 to 21.11b1 (#380) Bumps [black](https://github.com/psf/black) from 21.11b0 to 21.11b1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/commits) --- updated-dependencies: - dependency-name: black dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 882341a..37dc606 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ -e . -black==21.11b0 +black==21.11b1 bandit==1.7.1 coverage==6.1.2 docutils==0.18 From d54ae4230fe1fc78657262771ca8b96172dc91c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 04:32:20 +0000 Subject: [PATCH 7/7] Bump docutils from 0.18 to 0.18.1 (#381) Bumps [docutils](http://docutils.sourceforge.net/) from 0.18 to 0.18.1. --- updated-dependencies: - dependency-name: docutils dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 37dc606..a729d5a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ black==21.11b1 bandit==1.7.1 coverage==6.1.2 -docutils==0.18 +docutils==0.18.1 flake8==4.0.1 mypy==0.910 pyroma==3.2