From 056bb0834b8fca739dec3e731b01f2f6631be142 Mon Sep 17 00:00:00 2001 From: awaelchli Date: Thu, 4 Jul 2024 09:37:37 +0200 Subject: [PATCH] Avoid overwriting the `lightning_app` entry point (#20041) * don't overwrite lightning_app entry point * bump version * trigger ci --- .github/workflows/ci-pkg-install.yml | 7 ++++--- src/lightning/__setup__.py | 1 - src/lightning/fabric/CHANGELOG.md | 1 + src/version.info | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-pkg-install.yml b/.github/workflows/ci-pkg-install.yml index 67a9b9f21b515..90c60fdb7945c 100644 --- a/.github/workflows/ci-pkg-install.yml +++ b/.github/workflows/ci-pkg-install.yml @@ -73,13 +73,14 @@ jobs: pkg-extra: ${{ matrix.pkg-extra }} - name: Run CLI (via python) - if: ${{ (matrix.pkg-name == 'lightning' || matrix.pkg-name == 'notset') && matrix.pkg-extra == 'app' }} + if: ${{ (matrix.pkg-name == 'lightning' || matrix.pkg-name == 'notset') }} run: python -m lightning --version + - name: Run CLI (direct bash) if: | - ((matrix.pkg-name == 'lightning' || matrix.pkg-name == 'notset') && matrix.pkg-extra == 'app') || + ((matrix.pkg-name == 'lightning' || matrix.pkg-name == 'notset') || matrix.pkg-name == 'app' - run: lightning_app --version + run: lightning --version - name: DocTests actions working-directory: .actions/ diff --git a/src/lightning/__setup__.py b/src/lightning/__setup__.py index 81eae48545180..67cd954516187 100644 --- a/src/lightning/__setup__.py +++ b/src/lightning/__setup__.py @@ -114,7 +114,6 @@ def _setup_args() -> Dict[str, Any]: "console_scripts": [ "fabric = lightning.fabric.cli:_main", "lightning = lightning.fabric.cli:_legacy_main", - "lightning_app = lightning:_cli_entry_point", ], }, "setup_requires": [], diff --git a/src/lightning/fabric/CHANGELOG.md b/src/lightning/fabric/CHANGELOG.md index 102783ea81849..80f98ea678f72 100644 --- a/src/lightning/fabric/CHANGELOG.md +++ b/src/lightning/fabric/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). + ## [2.3.0] - 2024-06-13 ### Added diff --git a/src/version.info b/src/version.info index 2bf1c1ccf363a..f90b1afc082fd 100644 --- a/src/version.info +++ b/src/version.info @@ -1 +1 @@ -2.3.1 +2.3.2