Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split out setup.cfg from pyproject.toml #358

Merged
merged 3 commits into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_LATEST }}
cache: pip
- run: python -m pip install build
name: Install core libraries for build and install
- name: Build artifacts
Expand Down Expand Up @@ -68,17 +69,21 @@ jobs:
- python-version: "~3.12.0-0"
experimental: true
steps:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Checkout the source code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: pip
cache-dependency-path: |
setup.cfg
requirements-dev.txt
- name: Install dependencies
run: |
pip install -r requirements-dev.txt
pip install -U -r requirements-dev.txt
- name: Run tests
run: python -m pytest --cov=aiomonitor -v tests
- name: Upload coverage data
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
python-version: ${{ env.PYTHON_LATEST }}
cache: pip
cache-dependency-path: |
pyproject.toml
setup.cfg
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think both files are needed here.

requirements-dev.txt
- name: Install dependencies
run: |
Expand All @@ -54,9 +54,8 @@ jobs:
check-latest: true
cache: pip
cache-dependency-path: |
pyproject.toml
setup.cfg
requirements-dev.txt
requirements-doc.txt
- name: Install dependencies
run: |
pip install -U -r requirements-dev.txt
Expand All @@ -79,9 +78,8 @@ jobs:
check-latest: true
cache: pip
cache-dependency-path: |
pyproject.toml
setup.cfg
requirements-dev.txt
requirements-doc.txt
- name: Install dependencies
run: |
pip install -U -r requirements-dev.txt
Expand All @@ -104,9 +102,8 @@ jobs:
check-latest: true
cache: pip
cache-dependency-path: |
pyproject.toml
setup.cfg
requirements-dev.txt
requirements-doc.txt
- name: Install dependencies
run: |
pip install -U -r requirements-dev.txt
Expand Down
45 changes: 0 additions & 45 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,6 @@
requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
build-backend = "setuptools.build_meta"

[project]
name = "aiomonitor"
description = "Adds monitor and Python REPL capabilities for asyncio applications"
readme = {file = "README.rst", content-type = "text/x-rst"}
license = {file = "LICENSE"}
authors = [
{name = "Nikolay Novik", email = "[email protected]"},
]
maintainers = [
{name = "Joongi Kim", email = "[email protected]"},
]
classifiers = [
"License :: OSI Approved :: MIT License",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Operating System :: POSIX",
"Development Status :: 3 - Alpha",
"Framework :: AsyncIO",
]

dynamic = ["version"]

requires-python = ">=3.8"
dependencies = [
"attrs>=20",
"click>=8",
"janus>=1.0",
"terminaltables",
"typing-extensions>=4.1",
"prompt_toolkit>=3.0",
"aioconsole",
]

[project.urls]
homepage = "https://github.com/aio-libs/aiomonitor"
documentation = "https://aiomonitor.readthedocs.io"
repository = "https://github.com/aio-libs/aiomonitor"
issues = "https://github.com/aio-libs/aiomonitor/issues"
changelog = "https://github.com/aio-libs/aiomonitor/blob/main/CHANGES.rst"
chat = "https://matrix.to/#/%23aio-libs:matrix.org"

[tool.setuptools_scm]
# enables setuptools_scm to provide the dynamic version

Expand Down
53 changes: 53 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
[metadata]
name = aiomonitor
version = attr: aiomonitor.__version__
author = Nikolay Novik
author_email = [email protected]
maintainer = Joongi Kim
maintainer_email = [email protected]
description = Adds monitor and Python REPL capabilities for asyncio applications
long_description = file: README.rst, CHANGES.rst
keywords = asyncio, aiohttp, monitor, debugging, utility, devtool
license = Apache-2.0
license_files = LICENSE
classifiers =
License :: OSI Approved :: MIT License
Intended Audience :: Developers
Programming Language :: Python :: 3
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Operating System :: POSIX
Development Status :: 3 - Alpha
Framework :: AsyncIO
platforms = POSIX
download_url = https://pypi.org/project/aiomonitor
project_urls =
Homepage = https://github.com/aio-libs/aiomonitor
Documentation = https://aiomonitor.readthedocs.io
Repository = https://github.com/aio-libs/aiomonitor
Issues = https://github.com/aio-libs/aiomonitor/issues
Changelog = https://github.com/aio-libs/aiomonitor/blob/main/CHANGES.rst
Chat = https://matrix.to/#/!aio-libs:matrix.org
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll need to check how this is parsed.


[options]
zip_safe = False
include_package_data = True
packages = find:
python_requires = >=3.8
install_requires =
attrs>=20
click>=8
janus>=1.0
terminaltables
typing-extensions>=4.1
prompt_toolkit>=3.0
aioconsole

[options.packages.find]
exclude =
examples/*
tools/*
.*.yml
*.egg-info