From 0bf95f92cb33995e4429ba1e6fd5712bef976229 Mon Sep 17 00:00:00 2001 From: Robert Craigie Date: Sun, 22 Sep 2024 22:01:28 +0100 Subject: [PATCH] refactor(internal): switch to src dir (#301) --- .github/scripts/get_version.py | 2 +- .github/workflows/release.yml | 2 +- pyproject.toml | 6 +++--- setup.py | 12 ++++++++---- {pyright => src/pyright}/__init__.py | 0 {pyright => src/pyright}/__main__.py | 0 {pyright => src/pyright}/_mureq.py | 0 {pyright => src/pyright}/_utils.py | 0 {pyright => src/pyright}/_version.py | 0 {pyright => src/pyright}/cli.py | 0 {pyright => src/pyright}/errors.py | 0 {pyright => src/pyright}/langserver.py | 0 {pyright => src/pyright}/node.py | 0 {pyright => src/pyright}/py.typed | 0 {pyright => src/pyright}/types.py | 0 {pyright => src/pyright}/utils.py | 0 version.py | 4 ++-- 17 files changed, 15 insertions(+), 11 deletions(-) rename {pyright => src/pyright}/__init__.py (100%) rename {pyright => src/pyright}/__main__.py (100%) rename {pyright => src/pyright}/_mureq.py (100%) rename {pyright => src/pyright}/_utils.py (100%) rename {pyright => src/pyright}/_version.py (100%) rename {pyright => src/pyright}/cli.py (100%) rename {pyright => src/pyright}/errors.py (100%) rename {pyright => src/pyright}/langserver.py (100%) rename {pyright => src/pyright}/node.py (100%) rename {pyright => src/pyright}/py.typed (100%) rename {pyright => src/pyright}/types.py (100%) rename {pyright => src/pyright}/utils.py (100%) diff --git a/.github/scripts/get_version.py b/.github/scripts/get_version.py index 59a42c2..13c9b1d 100644 --- a/.github/scripts/get_version.py +++ b/.github/scripts/get_version.py @@ -3,7 +3,7 @@ def main() -> None: - path = Path(__file__).parent.parent.parent / 'pyright' / '_version.py' + path = Path(__file__).parent.parent.parent / 'src' / 'pyright' / '_version.py' contents = path.read_text() match = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', contents, re.MULTILINE) if match is None: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ffd54e8..57aeda2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: branches: - main paths: - - "pyright/_version.py" + - "src/pyright/_version.py" workflow_dispatch: jobs: diff --git a/pyproject.toml b/pyproject.toml index 572b23a..e195cfa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ line-length = 120 output-format = "grouped" target-version = "py37" -extend-exclude = ["pyright/_mureq.py"] +extend-exclude = ["src/pyright/_mureq.py"] [tool.ruff.lint] select = [ @@ -42,11 +42,11 @@ docstring-code-format = true [tool.pyright] include = [ - "pyright", + "src", "tests", ] exclude = [ - "pyright/_mureq.py" + "src/pyright/_mureq.py" ] pythonVersion = "3.9" diff --git a/setup.py b/setup.py index c84df55..6d0278f 100755 --- a/setup.py +++ b/setup.py @@ -2,13 +2,13 @@ # -*- coding: utf-8 -*- import re -from setuptools import setup +from setuptools import setup, find_packages with open('README.md', 'r') as f: readme = f.read() version = '' -with open('pyright/_version.py') as f: +with open('src/pyright/_version.py') as f: match = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', f.read(), re.MULTILINE) if not match: raise RuntimeError('version is not set') @@ -41,9 +41,13 @@ install_requires=requirements, long_description=readme, long_description_content_type='text/markdown', - packages=['pyright'], - python_requires='>=3.7', + packages=find_packages( + where='src', + include=['pyright', 'pyright.*'], + ), + package_dir={'': 'src'}, package_data={'': ['py.typed']}, + python_requires='>=3.7', include_package_data=True, zip_safe=False, entry_points={ diff --git a/pyright/__init__.py b/src/pyright/__init__.py similarity index 100% rename from pyright/__init__.py rename to src/pyright/__init__.py diff --git a/pyright/__main__.py b/src/pyright/__main__.py similarity index 100% rename from pyright/__main__.py rename to src/pyright/__main__.py diff --git a/pyright/_mureq.py b/src/pyright/_mureq.py similarity index 100% rename from pyright/_mureq.py rename to src/pyright/_mureq.py diff --git a/pyright/_utils.py b/src/pyright/_utils.py similarity index 100% rename from pyright/_utils.py rename to src/pyright/_utils.py diff --git a/pyright/_version.py b/src/pyright/_version.py similarity index 100% rename from pyright/_version.py rename to src/pyright/_version.py diff --git a/pyright/cli.py b/src/pyright/cli.py similarity index 100% rename from pyright/cli.py rename to src/pyright/cli.py diff --git a/pyright/errors.py b/src/pyright/errors.py similarity index 100% rename from pyright/errors.py rename to src/pyright/errors.py diff --git a/pyright/langserver.py b/src/pyright/langserver.py similarity index 100% rename from pyright/langserver.py rename to src/pyright/langserver.py diff --git a/pyright/node.py b/src/pyright/node.py similarity index 100% rename from pyright/node.py rename to src/pyright/node.py diff --git a/pyright/py.typed b/src/pyright/py.typed similarity index 100% rename from pyright/py.typed rename to src/pyright/py.typed diff --git a/pyright/types.py b/src/pyright/types.py similarity index 100% rename from pyright/types.py rename to src/pyright/types.py diff --git a/pyright/utils.py b/src/pyright/utils.py similarity index 100% rename from pyright/utils.py rename to src/pyright/utils.py diff --git a/version.py b/version.py index cd308b4..008878a 100644 --- a/version.py +++ b/version.py @@ -6,7 +6,7 @@ def get_pyright_version() -> str: - with open('pyright/_version.py') as f: + with open('src/pyright/_version.py') as f: match = re.search(r'^__pyright_version__\s*=\s*[\'"]([^\'"]*)[\'"]', f.read(), re.MULTILINE) if not match: raise RuntimeError('version is not set') @@ -19,7 +19,7 @@ def compare(ver: str) -> bool: def set_pyright_ver(ver: str): - with fileinput.input('pyright/_version.py', inplace=True) as f: + with fileinput.input('src/pyright/_version.py', inplace=True) as f: for line in f: line = re.sub( r'^__pyright_version__\s*=\s*[\'"]([^\'"]*)[\'"]',