Friendship ended with poetry, uv is my new best friend

Signed-off-by: Edward Z. Yang <[email protected]>

ghstack-source-id: 7eaabd7
ghstack-comment-id: 2725364353
Pull Request resolved: ezyang#275

Author: ezyang

.github/workflows/lint.yml

@@ -16,20 +16,17 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Install Poetry
-        run: pipx install poetry==1.7.1
-      - name: Install Python
-        uses: actions/setup-python@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: poetry
-      - name: Install dependencies
-        run: poetry install
+          enable-cache: true
+          cache-suffix: "optional-suffix"
       - name: Run lint
         run: |
           RC=0
           # Run lintrunner on all files
-          if ! poetry run lintrunner --force-color --all-files --tee-json=lint.json 2> /dev/null; then
+          if ! uv run --frozen lintrunner --force-color --all-files --tee-json=lint.json 2> /dev/null; then
             echo ""
             echo -e "\e[1m\e[36mYou can reproduce these results locally by using \`lintrunner\`. (If you don't get the same results, run \'lintrunner init\' to update your local linter)\e[0m"
             RC=1

.github/workflows/test.yml

@@ -16,14 +16,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Install Poetry
-        run: pipx install poetry==1.7.1
-      - name: Install Python
-        uses: actions/setup-python@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: poetry
-      - name: Install dependencies
-        run: poetry install
+          enable-cache: true
+          cache-suffix: "optional-suffix"
       - name: Run tests
-        run: poetry run pytest --verbose
+        run: uv run --frozen pytest --verbose

README.md

@@ -74,51 +74,6 @@ pull request and pushes commits onto three branches:
   want to work on the commits from another machine, this is the best way
   to get it.
 
-## Developer notes
-
-This project uses [Poetry](https://python-poetry.org/docs/#installation), so
-after you've installed Poetry itself, run this command in your clone of this
-repo to install all the dependencies you need for working on `ghstack`:
-```
-poetry install
-```
-Note that this installs the dependencies (and `ghstack` itself) in an isolated
-Python virtual environment rather than globally. If your cwd is in your clone of
-this repo then you can run your locally-built `ghstack` using `poetry run
-ghstack $ARGS`, but if you want to run it from somewhere else, you probably want
-[`poetry shell`](https://python-poetry.org/docs/cli/#shell) instead:
-```
-poetry shell
-cd $SOMEWHERE
-ghstack $ARGS
-```
-
-### Testing
-
-We have tests, using a mock GitHub GraphQL server!  How cool is that?
-```
-poetry run python test_ghstack.py
-```
-That runs most of the tests; you can run all tests (including lints) like this:
-```
-poetry run python run_tests.py
-```
-
-### Publishing
-
-You can also [use Poetry to
-publish](https://python-poetry.org/docs/cli/#publish) to a package repository.
-For instance, if you've configured your [Poetry
-repositories](https://python-poetry.org/docs/repositories/) like this:
-```
-poetry config repositories.testpypi https://test.pypi.org/legacy/
-```
-Then you can publish to TestPyPI like this:
-```
-poetry publish --build --repository testpypi
-```
-To publish to PyPI itself, just omit the `--repository` argument.
-
 ## Design constraints
 
 There are some weird aspects about GitHub's design which lead to unusual

poetry.lock

@@ -1,44 +1,49 @@
-[tool.poetry]
+[project]
+authors = [
+    {name = "Edward Z. Yang", email = "[email protected]"},
+]
+license = {text = "MIT"}
+requires-python = "<4.0.0,>=3.8.1"
+dependencies = [
+    "aiohttp<4,>=3",
+    "importlib-metadata>=1.4; python_version < \"3.8\"",
+    "requests<3,>=2",
+    "typing-extensions>=3",
+    "click<9,>=8",
+    "flake8<8.0.0,>=7.0.0",
+]
 name = "ghstack"
 version = "0.9.4"
-authors = ["Edward Z. Yang <[email protected]>"]
 description = "Stack diff support for GitHub"
 readme = "README.md"
-repository = "https://github.com/ezyang/ghstack"
-include = ["ghstack/py.typed"]
-license = "MIT"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
 
-[tool.poetry.scripts]
-ghstack = "ghstack.cli:main"
+[project.urls]
+repository = "https://github.com/ezyang/ghstack"
 
-[tool.poetry.dependencies]
-aiohttp = "^3"
-importlib-metadata = { version = ">=1.4", python = "<3.8" }
-python = "^3.8.1"
-requests = "^2"
-typing-extensions = ">=3 <5"
-click = "^8"
-flake8 = "^7.0.0"
+[project.scripts]
+ghstack = "ghstack.cli:main"
 
-[tool.poetry.dev-dependencies]
-black = "^24.3.0"
-flake8 = "^7"
-graphql-core = "^3"
-hypothesis = "^6"
-mypy = "^1"
-pytest = "^7"
-usort = "^1"
-ufmt = "^2"
-lintrunner = "^0.11.0"
-types-requests = "^2.31.0.10"
-pytest-xdist = "^3.5.0"
-expecttest = "^0.2.0"
+[dependency-groups]
+dev = [
+    "black<25.0.0,>=24.3.0",
+    "flake8<8,>=7",
+    "graphql-core<4,>=3",
+    "hypothesis<7,>=6",
+    "mypy<2,>=1",
+    "pytest<8,>=7",
+    "usort<2,>=1",
+    "ufmt<3,>=2",
+    "lintrunner<1.0.0,>=0.11.0",
+    "types-requests<3.0.0.0,>=2.31.0.10",
+    "pytest-xdist<4.0.0,>=3.5.0",
+    "expecttest<1.0.0,>=0.2.0",
+]
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["uv_build>=0.6,<0.7"]
+build-backend = "uv_build"

pyproject.toml

@@ -26,7 +26,7 @@ def main(
             }
         }
     """,
-        **params
+        **params,
     )
     pr_id = pr_result["data"]["repository"]["pullRequest"]["id"]
 

ghstack/__init__.py renamed to src/ghstack/__init__.py

@@ -73,7 +73,7 @@ async def main(
         }
     }
     """,
-        **params
+        **params,
     )
     nodes = r["data"]["repository"]["pullRequest"]["commits"]["nodes"]
 

ghstack/__main__.py renamed to src/ghstack/__main__.py

@@ -38,7 +38,7 @@ def get_head_ref(self, **params: Any) -> str:
                 }
             }
         """,
-            **params
+            **params,
         )
         r = pr_result["data"]["repository"]["pullRequest"]["headRefName"]
         assert isinstance(r, str), type(r)

ghstack/action.py renamed to src/ghstack/action.py

@@ -92,7 +92,7 @@ def sh(
         stdin: _HANDLE = None,
         stdout: _HANDLE = subprocess.PIPE,
         exitcode: bool = False,
-        tick: bool = False
+        tick: bool = False,
     ) -> _SHELL_RET:
         """
         Run a command specified by args, and return string representing

ghstack/cache.py renamed to src/ghstack/cache.py

@@ -77,7 +77,7 @@ async def main(
         }
     }
     """,
-        **params
+        **params,
     )
     contexts = r["data"]["repository"]["pullRequest"]["commits"]["nodes"][0]["commit"][
         "status"