From 664111c0c87f2cfa38c3f871657cca99e75c73df Mon Sep 17 00:00:00 2001 From: KOLANICH Date: Thu, 12 May 2022 11:41:50 +0300 Subject: [PATCH 1/2] Restored the copyright header accidentially not kept in the semi-automatic conversions. --- setup.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.cfg b/setup.cfg index e6850a0..3cca9a8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,6 @@ +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + [metadata] name = python-lsp-jsonrpc author = Python Language Server Contributors From 73ab7c5e6e889019ec79f48f3eafb62e9e5dbe23 Mon Sep 17 00:00:00 2001 From: KOLANICH Date: Fri, 6 May 2022 14:19:57 +0300 Subject: [PATCH 2/2] Migrated metadata from `setup.cfg` to PEP 621-compliant `pyproject.toml`. --- pyproject.toml | 40 +++++++++++++++++++++++++++++++++++++++- setup.cfg | 36 ------------------------------------ 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 28b0e6a..ec4fd33 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,45 @@ +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + [build-system] -requires = ["setuptools>=44", "wheel", "setuptools_scm[toml]>=3.4.3"] +requires = ["setuptools>=61.2.0", "wheel", "setuptools_scm[toml]>=3.4.3"] build-backend = "setuptools.build_meta" +[project] +name = "python-lsp-jsonrpc" +authors = [{name = "Python Language Server Contributors"}] +description = "JSON RPC 2.0 server library" +dependencies = ["ujson>=3.0.0"] +dynamic = ["version"] + +[project.readme] +file = "README.md" +content-type = "text/markdown" + +[project.urls] +Homepage = "https://github.com/python-lsp/python-lsp-jsonrpc" + +[project.optional-dependencies] +test = [ + "pylint", + "pycodestyle", + "pyflakes", + "pytest", + "pytest-cov", + "coverage", +] + +[tool.setuptools] +include-package-data = false + +[tool.setuptools.packages.find] +exclude = ["contrib", "docs", "test", "test.*"] +namespaces = false + [tool.setuptools_scm] write_to = "pylsp_jsonrpc/_version.py" write_to_template = "__version__ = \"{version}\"\n" # VERSION_INFO is populated in __main__ + +[tool.pytest.ini_options] +testpaths = ["test"] +addopts = "--cov-report html --cov-report term --junitxml=pytest.xml --cov pylsp_jsonrpc --cov test" diff --git a/setup.cfg b/setup.cfg index 3cca9a8..933ff6a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,43 +1,7 @@ # Copyright 2017-2020 Palantir Technologies, Inc. # Copyright 2021- Python Language Server Contributors. -[metadata] -name = python-lsp-jsonrpc -author = Python Language Server Contributors -description = JSON RPC 2.0 server library -url = https://github.com/python-lsp/python-lsp-jsonrpc -long_description = file: README.md -long_description_content_type = text/markdown - - -[options] -packages = find: -setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3 -install_requires = ujson>=3.0.0 - -[options.packages.find] -exclude = - contrib - docs - test - test.* - -[options.extras_require] -test = - pylint - pycodestyle - pyflakes - pytest - pytest-cov - coverage - [pycodestyle] ignore = E226, E722, W504 max-line-length = 120 exclude = test/plugins/.ropeproject,test/.ropeproject - -[tool:pytest] -testpaths = test -addopts = - --cov-report html --cov-report term --junitxml=pytest.xml - --cov pylsp_jsonrpc --cov test