refactor(internal): switch to src dir (#301)

RobertCraigie · Sep 22, 2024 · 0bf95f9 · 0bf95f9
1 parent f4beb25
commit 0bf95f9
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → src/pyright/__init__.py b/pyright/__init__.py → src/pyright/__init__.py
diff --git a/pyright/__main__.py → src/pyright/__main__.py b/pyright/__main__.py → src/pyright/__main__.py
diff --git a/pyright/_mureq.py → src/pyright/_mureq.py b/pyright/_mureq.py → src/pyright/_mureq.py
diff --git a/pyright/_utils.py → src/pyright/_utils.py b/pyright/_utils.py → src/pyright/_utils.py
diff --git a/pyright/_version.py → src/pyright/_version.py b/pyright/_version.py → src/pyright/_version.py
diff --git a/pyright/cli.py → src/pyright/cli.py b/pyright/cli.py → src/pyright/cli.py
diff --git a/pyright/errors.py → src/pyright/errors.py b/pyright/errors.py → src/pyright/errors.py
diff --git a/pyright/langserver.py → src/pyright/langserver.py b/pyright/langserver.py → src/pyright/langserver.py
diff --git a/pyright/node.py → src/pyright/node.py b/pyright/node.py → src/pyright/node.py
diff --git a/pyright/py.typed → src/pyright/py.typed b/pyright/py.typed → src/pyright/py.typed
diff --git a/pyright/types.py → src/pyright/types.py b/pyright/types.py → src/pyright/types.py
diff --git a/pyright/utils.py → src/pyright/utils.py b/pyright/utils.py → src/pyright/utils.py
diff --git 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*[\'"]([^\'"]*)[\'"]',