Alberto Donato has proposed merging ~ack/maas:setup-cfg-lint into maas:master.
Commit message: run setup-py-upgrade and setup-cfg-fmt in format phase They ensure linting on setup.cfg and migrate anything that might be added to setup.py to setup.cfg Requested reviews: MAAS Maintainers (maas-maintainers) For more details, see: https://code.launchpad.net/~ack/maas/+git/maas/+merge/437947 -- Your team MAAS Maintainers is requested to review the proposed merge of ~ack/maas:setup-cfg-lint into maas:master.
diff --git a/setup.cfg b/setup.cfg index 3040ef0..b9e676b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,120 +3,121 @@ name = maas version = 3.4.0a1 description = Metal As A Service long_description = file: README.rst +long_description_content_type = text/x-rst url = https://maas.io/ -license = AGPLv3 author = MAAS Developers author_email = [email protected] +license = AGPL-3.0 +license_file = LICENSE classifiers = - Development Status :: 5 - Production/Stable - Intended Audience :: Information Technology - Intended Audience :: System Administrators - License :: OSI Approved :: GNU Affero General Public License v3 - Operating System :: POSIX :: Linux - Programming Language :: JavaScript - Programming Language :: Python :: 3 - Topic :: System :: Systems Administration + Development Status :: 5 - Production/Stable + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: GNU Affero General Public License v3 + Operating System :: POSIX :: Linux + Programming Language :: JavaScript + Programming Language :: Python :: 3 + Topic :: System :: Systems Administration [options] -include_package_data = true packages = find: +include_package_data = true package_dir = - = src - -[options.entry_points] -console_scripts = - maas = maascli:main - maas-common = provisioningserver.rack_script:run - maas-power = provisioningserver.power_driver_command:run - maas-rack = provisioningserver.rack_script:run - maas-region = maasserver.region_script:run - maas-sampledata = maasserver.testing.sampledata.main:main - rackd = provisioningserver.server:run - regiond = maasserver.server:run - test.region = maastesting.scripts:run_region - test.region.legacy = maastesting.scripts:run_region_legacy - test.rack = maastesting.scripts:run_rack - test.parallel = maastesting.scripts:run_parallel -pytest11 = - maas-django = maastesting.pytest.django - maas-seeds = maastesting.pytest.seeds - maas-perftest = maastesting.pytest.perftest + = src [options.packages.find] where = src exclude = - *.testing - *.tests - *.pytest_tests - maastesting - maastesting.* + *.testing + *.tests + *.pytest_tests + maastesting + maastesting.* + +[options.entry_points] +console_scripts = + maas = maascli:main + maas-common = provisioningserver.rack_script:run + maas-power = provisioningserver.power_driver_command:run + maas-rack = provisioningserver.rack_script:run + maas-region = maasserver.region_script:run + maas-sampledata = maasserver.testing.sampledata.main:main + rackd = provisioningserver.server:run + regiond = maasserver.server:run + test.region = maastesting.scripts:run_region + test.region.legacy = maastesting.scripts:run_region_legacy + test.rack = maastesting.scripts:run_rack + test.parallel = maastesting.scripts:run_parallel +pytest11 = + maas-django = maastesting.pytest.django + maas-seeds = maastesting.pytest.seeds + maas-perftest = maastesting.pytest.perftest [options.data_files] /etc/maas = - etc/maas/drivers.yaml + etc/maas/drivers.yaml /usr/share/maas = - contrib/maas-http.conf -/usr/share/maas/promtail = - contrib/promtail/promtail.yaml.example + contrib/maas-http.conf +/usr/share/maas/promtail = + contrib/promtail/promtail.yaml.example /usr/share/maas/grafana_agent = - contrib/grafana_agent/agent.yaml.example - contrib/grafana_agent/env + contrib/grafana_agent/agent.yaml.example + contrib/grafana_agent/env /etc/maas/preseeds = - contrib/preseeds_v2/commissioning - contrib/preseeds_v2/enlist - contrib/preseeds_v2/curtin - contrib/preseeds_v2/curtin_userdata - contrib/preseeds_v2/curtin_userdata_centos - contrib/preseeds_v2/curtin_userdata_custom - contrib/preseeds_v2/curtin_userdata_suse - contrib/preseeds_v2/curtin_userdata_windows + contrib/preseeds_v2/commissioning + contrib/preseeds_v2/enlist + contrib/preseeds_v2/curtin + contrib/preseeds_v2/curtin_userdata + contrib/preseeds_v2/curtin_userdata_centos + contrib/preseeds_v2/curtin_userdata_custom + contrib/preseeds_v2/curtin_userdata_suse + contrib/preseeds_v2/curtin_userdata_windows /usr/sbin = - scripts/maas-dhcp-helper + scripts/maas-dhcp-helper /usr/lib/maas = - scripts/dhcp-monitor - scripts/beacon-monitor - scripts/network-monitor - scripts/maas-delete-file - scripts/maas-test-enlistment - scripts/maas-write-file - scripts/unverified-ssh + scripts/dhcp-monitor + scripts/beacon-monitor + scripts/network-monitor + scripts/maas-delete-file + scripts/maas-test-enlistment + scripts/maas-write-file + scripts/unverified-ssh [globals] lint_files = - setup.py - src/apiclient - src/maascli - src/maasperf - src/maasserver - src/maastesting - src/metadataserver - src/provisioningserver - src/provisioningserver/refresh/50-maas-01-commissioning - utilities/bin2python.py - utilities/check-imports - utilities/check-oapi - utilities/import-db-dump - utilities/python_standard_libs.py - utilities/snap-bind-mounts + setup.py + src/apiclient + src/maascli + src/maasperf + src/maasserver + src/maastesting + src/metadataserver + src/provisioningserver + src/provisioningserver/refresh/50-maas-01-commissioning + utilities/bin2python.py + utilities/check-imports + utilities/check-oapi + utilities/import-db-dump + utilities/python_standard_libs.py + utilities/snap-bind-mounts cog_files = - src/maastesting/pytest.dirs - pyproject.toml - - + src/maastesting/pytest.dirs + pyproject.toml deps_lint = - black == 23.1.0 - flake8 == 6.0.0 - isort == 5.12.0 - cogapp == 3.3.0 - click == 8.1.3 - + black == 23.1.0 + flake8 == 6.0.0 + isort == 5.12.0 + cogapp == 3.3.0 + click == 8.1.3 + setup-cfg-fmt==2.2.0 + setup-py-upgrade==1.2.1 deps_oapi = - openapi-spec-validator == 0.4.0 + openapi-spec-validator == 0.4.0 [flake8] ignore = E203, E266, E501, W503, W504 exclude = - src/*/migrations/* + src/*/migrations/* [tox:tox] skipsdist = True @@ -125,19 +126,21 @@ envlist = format,lint,oapi [testenv:format] deps = {[globals]deps_lint} commands = - isort {[globals]lint_files} - black -q {[globals]lint_files} - cog -r --verbosity=1 {[globals]cog_files} + setup-py-upgrade . + setup-cfg-fmt setup.cfg + isort {[globals]lint_files} + black -q {[globals]lint_files} + cog -r --verbosity=1 {[globals]cog_files} [testenv:lint] deps = {[globals]deps_lint} commands = - isort --check-only --diff {[globals]lint_files} - black --check {[globals]lint_files} - flake8 {[globals]lint_files} - cog --check --verbosity=1 {[globals]cog_files} + isort --check-only --diff {[globals]lint_files} + black --check {[globals]lint_files} + flake8 {[globals]lint_files} + cog --check --verbosity=1 {[globals]cog_files} [testenv:oapi] deps = {[globals]deps_oapi} commands = - python3 utilities/check-oapi openapi.yaml + {envpython} utilities/check-oapi openapi.yaml diff --git a/setup.py b/setup.py index 9280621..6068493 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,3 @@ -# Copyright 2012-2021 Canonical Ltd. This software is licensed under the -# GNU Affero General Public License version 3 (see the file LICENSE). - from setuptools import setup setup()
-- Mailing list: https://launchpad.net/~sts-sponsors Post to : [email protected] Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
