build: reenable publish job in workflow

Author: d-biehl

.github/workflows/build-test-package-publish.yml

@@ -171,85 +171,72 @@ jobs:
           name: wheel-package
           path: dist/*.whl
 
-  # publish:
-  #   runs-on: ubuntu-latest
-  #   needs: package
-  #   if: success() && startsWith( github.ref, 'refs/tags/v')
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         fetch-depth: 0
-
-  #     - run: git describe --tag
-
-  #     - name: setup python environment
-  #       id: setup-python
-  #       uses: actions/setup-python@v4
-  #       with:
-  #         python-version: "3.8"
-
-  #     - name: install Poetry
-  #       uses: snok/install-poetry@v1
-  #       with:
-  #         virtualenvs-create: true
-  #         virtualenvs-in-project: true
-
-  #     - name: Load cached venv
-  #       id: cached-poetry-dependencies
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: .venv
-  #         key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
-
-  #     - name: Install dependencies
-  #       if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-  #       run: poetry install --no-interaction --no-root
-
-  #     - name: install robotcode
-  #       run: poetry install --no-interaction
-
-  #     - name: Setup Node.js environment
-  #       uses: actions/setup-node@v3
-  #       with:
-  #         node-version: "16"
-  #         cache: "npm"
-  #         cache-dependency-path: package-lock.json
-
-  #     - name: install node modules
-  #       run: npm install --also=dev
-
-  #     - uses: actions/download-artifact@v3
-  #       with:
-  #         name: vscode-package
-  #         path: dist
-  #     - uses: actions/download-artifact@v3
-  #       with:
-  #         name: python-package
-  #         path: dist
-  #     - uses: actions/download-artifact@v3
-  #       with:
-  #         name: wheel-package
-  #         path: dist
-
-  #     - name: get release informations
-  #       id: get_release_informations
-  #       run: |
-  #         poetry run npm run --silent extract-release-notes > ./auto_relnotes.md
-
-  #         echo "is_prelease=$(poetry run npm run --silent is-prerelease)" >> $GITHUB_OUTPUT
-
-  #     - name: create github release
-  #       uses: ncipollo/release-action@v1
-  #       with:
-  #         artifacts: "dist/*"
-  #         prerelease: ${{ steps.get_release_informations.outputs.is_prelease }}
-  #         bodyFile: ./auto_relnotes.md
-  #         token: ${{ secrets.GITHUB_TOKEN }}
-
-  #     - name: publish vsix and python packages
-  #       run: poetry run npm run publish
-  #       env:
-  #         VSCE_PAT: ${{ secrets.VSCE_PAT }}
-  #         OVSX_PAT: ${{ secrets.OVSX_PAT }}
-  #         PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
-  #         PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+  publish:
+    runs-on: ubuntu-latest
+    needs: package
+    if: success() && startsWith( github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - run: git describe --tag
+
+      - name: setup python environment
+        id: setup-python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+
+      - name: Ensure latest pip is installed
+        run: python -m pip install --upgrade pip
+
+      - name: Ensure latest hatch is installed
+        run: python -m pip install --upgrade hatch
+        run: hatch env create build
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+
+      - name: install node modules
+        run: npm install --also=dev
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: vscode-package
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: python-package
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: wheel-package
+          path: dist
+
+      - name: get release informations
+        id: get_release_informations
+        run: |
+          hatch -q run build:extract-release-notes > ./auto_relnotes.md
+
+          echo "is_prelease=$(hatch -q run build:is-prerelease)" >> $GITHUB_OUTPUT
+
+      - name: create github release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "dist/*"
+          prerelease: ${{ steps.get_release_informations.outputs.is_prelease }}
+          bodyFile: ./auto_relnotes.md
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: publish vsix and python packages
+        run: hatch -q run build:publish
+        env:
+          VSCE_PAT: ${{ secrets.VSCE_PAT }}
+          OVSX_PAT: ${{ secrets.OVSX_PAT }}
+          PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

scripts/extract_release_notes.py

@@ -1,6 +1,21 @@
+import contextlib
 import re
+import sys
 from pathlib import Path
 
+if __name__ == "__main__" and __package__ is None or __package__ == "":
+    file = Path(__file__).resolve()
+    parent, top = file.parent, file.parents[1]
+
+    if str(top) not in sys.path:
+        sys.path.append(str(top))
+
+    with contextlib.suppress(ValueError):
+        sys.path.remove(str(parent))
+
+    __package__ = "scripts"
+
+
 from scripts.tools import get_version
 
 

scripts/package.py

@@ -24,12 +24,12 @@ def main() -> None:
     if not dist_path.exists():
         dist_path.mkdir()
 
+    run("hatch -e build build", shell=True).check_returncode()
+
     run(
         f"npx vsce package {'--pre-release' if get_version().prerelease else ''} -o ./dist", shell=True
     ).check_returncode()
 
-    run("hatch -e build build", shell=True).check_returncode()
-
 
 if __name__ == "__main__":
     main()

scripts/publish.py

@@ -31,8 +31,8 @@ def main() -> None:
     run("npx vsce publish", f"npx vsce publish -i {vsix_path}", shell=True, timeout=600)
     run("npx ovsx publish", f"npx ovsx publish {vsix_path}", shell=True, timeout=600)
     run(
-        "poetry publish",
-        f"poetry publish --username {os.environ['PYPI_USERNAME']} --password {os.environ['PYPI_PASSWORD']}",
+        "hatch publish",
+        f'hatch -e build publish -u "{os.environ["PYPI_USERNAME"]}" -a "{os.environ["PYPI_PASSWORD"]}"',
         shell=True,
         timeout=600,
     )