From 6057e5b17169a4a38d842e7aeda2bb55460d6eb2 Mon Sep 17 00:00:00 2001 From: kompoth Date: Fri, 4 Apr 2025 18:01:13 +0400 Subject: [PATCH 1/7] Preping PyPI package --- pyproject.toml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 31efb94..2e795f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,20 @@ requires-python = ">=3.12" dependencies = [ "jedi>=0.19.2", ] +classifiers = [ + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Intended Audience :: Developers", + "Topic :: Software Development", + "Topic :: Software Development :: Quality Assurance", + "Typing :: Typed", + "Environment :: Plugins", + "Development Status :: 3 - Alpha", + "License :: OSI Approved :: MIT License", +] [project.optional-dependencies] pylsp = [ @@ -21,6 +35,10 @@ dev = [ "pytest-virtualenv>=1.8.1", ] +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + [project.entry-points.pylsp] starkiller = "starkiller.pylsp_plugin.plugin" From 02488401380fea6d00667326e6748c2f45606ef8 Mon Sep 17 00:00:00 2001 From: kompoth Date: Fri, 4 Apr 2025 18:02:18 +0400 Subject: [PATCH 2/7] Won't need to build the package anymore --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 042ab0c..3e6cfce 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,7 @@ To enable the plugin install Starkiller in the same virtual environment as `pyth dependency. E.g., with `pipx`: ```bash -uv build -pipx inject python-lsp-server ./dist/starkiller--py3-none-any.whl[pylsp] +pipx inject python-lsp-server starkiller[pylsp] ``` The plugin is enabled just the same way as any other `pylsp` plugin. E.g., in Neovim via From ba57df48f7df1bf959ab563885256fa494b466eb Mon Sep 17 00:00:00 2001 From: Vasily Negrebetskiy Date: Wed, 21 May 2025 08:37:42 +0400 Subject: [PATCH 3/7] Tests for 3.10 and 3.11 --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 99a3814..f3e3906 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,6 +29,8 @@ jobs: strategy: matrix: python-version: + - "3.10" + - "3.11" - "3.12" - "3.13" env: From b0755f831dbcd1843cd8802f7546d0d9d86ed5e4 Mon Sep 17 00:00:00 2001 From: Vasily Negrebetskiy Date: Wed, 21 May 2025 08:40:25 +0400 Subject: [PATCH 4/7] Classifiers update --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c45a38d..c6a4f40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,11 +11,13 @@ classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Intended Audience :: Developers", "Topic :: Software Development", - "Topic :: Software Development :: Quality Assurance", + "Topic :: Software Development :: Code Generators", "Typing :: Typed", "Environment :: Plugins", "Development Status :: 3 - Alpha", From 534213a2071e08956a417f6a6a5fc7a0205ed9b8 Mon Sep 17 00:00:00 2001 From: Vasily Negrebetskiy Date: Wed, 21 May 2025 09:12:24 +0400 Subject: [PATCH 5/7] Badges --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 558785a..4ee305b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Starkiller +[![PyPI - Version](https://img.shields.io/pypi/v/starkiller)](https://pypi.org/project/starkiller/) +![PyPI - Python Version](https://img.shields.io/pypi/pyversions/starkiller) [![CI status](https://github.com/kompoth/starkiller/actions/workflows/ci.yaml/badge.svg)](https://github.com/kompoth/starkiller/actions) **Work in progress** From 59a42d8bcd1266c79c907776c23c1df2be6981ec Mon Sep 17 00:00:00 2001 From: Vasily Negrebetskiy Date: Wed, 21 May 2025 09:16:36 +0400 Subject: [PATCH 6/7] pyproject fix --- pyproject.toml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c6a4f40..4a142ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,9 @@ [project] name = "starkiller" -version = "0.1.2" +version = "0.1.3" description = "Import refactoring package and pylsp plugin" readme = "README.md" -requires-python = ">=3.12" +requires-python = ">=3.10" dependencies = [ "jedi>=0.19.2", ] @@ -24,6 +24,9 @@ classifiers = [ "License :: OSI Approved :: MIT License", ] +[project.urls] +Homepage = "https://github.com/kompoth/starkiller" + [project.optional-dependencies] pylsp = [ "lsprotocol>=2023.0.1", @@ -76,3 +79,9 @@ convention = "google" line_length = 120 multi_line_output = 3 split_on_trailing_comma = true + +[[tool.uv.index]] +name = "testpypi" +url = "https://test.pypi.org/simple/" +publish-url = "https://test.pypi.org/legacy/" +explicit = true From 3a6e90fa2208b7f7806e8cfafbbbc7466e30283a Mon Sep 17 00:00:00 2001 From: Vasily Negrebetskiy Date: Wed, 21 May 2025 09:19:17 +0400 Subject: [PATCH 7/7] 3.12+ only --- .github/workflows/ci.yaml | 2 -- pyproject.toml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f3e3906..99a3814 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,8 +29,6 @@ jobs: strategy: matrix: python-version: - - "3.10" - - "3.11" - "3.12" - "3.13" env: diff --git a/pyproject.toml b/pyproject.toml index 4a142ec..f0a7c74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ name = "starkiller" version = "0.1.3" description = "Import refactoring package and pylsp plugin" readme = "README.md" -requires-python = ">=3.10" +requires-python = ">=3.12" dependencies = [ "jedi>=0.19.2", ] @@ -11,8 +11,6 @@ classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Intended Audience :: Developers",