build: reenable package in workflows

Author: d-biehl

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

@@ -107,83 +107,69 @@ jobs:
       - run: hatch run lint:typing
         if: always()
 
-  # package:
-  #   needs: [code-quality, test]
+  package:
+    needs: [code-quality, test]
 
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         fetch-depth: 0
-
-  #     - run: git describe --tag
-  #     - run: git describe --tag --long --first-parent --match "v[0-9]*"
+    runs-on: ubuntu-latest
 
-  #     - name: setup python environment
-  #       id: setup-python
-  #       uses: actions/setup-python@v4
-  #       with:
-  #         python-version: "3.8"
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
-  #     - name: install Poetry
-  #       uses: snok/install-poetry@v1
-  #       with:
-  #         virtualenvs-create: true
-  #         virtualenvs-in-project: true
+      - run: git describe --tag
+      - run: git describe --tag --long --first-parent --match "v[0-9]*"
 
-  #     - 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: setup python environment
+        id: setup-python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
 
-  #     - name: Install dependencies
-  #       if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-  #       run: poetry install --no-interaction --no-root
+      - name: Ensure latest pip is installed
+        run: python -m pip install --upgrade pip
 
-  #     - name: install robotcode
-  #       run: poetry install --no-interaction
+      - name: Ensure latest hatch is installed
+        run: python -m pip install --upgrade hatch
 
-  #     - name: Setup Node.js environment
-  #       uses: actions/setup-node@v3
-  #       with:
-  #         node-version: "16"
-  #         cache: "npm"
-  #         cache-dependency-path: package-lock.json
+      - 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
+      - name: install node modules
+        run: npm install --also=dev
 
-  #     - name: update versions from git
-  #       if: ${{ !startsWith( github.ref, 'refs/tags/v') }}
-  #       run: poetry run python ./scripts/update_git_versions.py
+      - name: update versions from git
+        if: ${{ !startsWith( github.ref, 'refs/tags/v') }}
+        run: hatch run build:update-git-versions
 
-  #     - name: update doc links
-  #       if: ${{ startsWith( github.ref, 'refs/tags/v') }}
-  #       run: poetry run npm run update-doc-links
+      - name: update doc links
+        if: ${{ startsWith( github.ref, 'refs/tags/v') }}
+        run: hatch run build:update-doc-links
 
-  #     - name: package
-  #       run: poetry run npm run package
+      - name: package
+        run: hatch run build:package
 
-  #     - name: Upload VSCode package
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: vscode-package
-  #         path: dist/robotcode*.vsix
+      - name: Upload VSCode package
+        uses: actions/upload-artifact@v3
+        with:
+          name: vscode-package
+          path: dist/robotcode*.vsix
 
-  #     - name: Upload python package
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: python-package
-  #         path: dist/*.tar.gz
+      - name: Upload python package
+        uses: actions/upload-artifact@v3
+        with:
+          name: python-package
+          path: dist/*.tar.gz
 
-  #     - name: Upload python wheel package
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: wheel-package
-  #         path: dist/*.whl
+      - name: Upload python wheel package
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheel-package
+          path: dist/*.whl
 
   # publish:
   #   runs-on: ubuntu-latest

package.json

@@ -1206,14 +1206,7 @@
     "pretest": "npm run compile && npm run lint",
     "lint": "eslint --ext .ts,.tsx,.js .",
     "lint-fix": "eslint --ext .ts,.tsx,.js --fix .",
-    "test": "node ./out/test/runTest.js",
-    "version": "python scripts/update_versions.py && git add .",
-    "package": "python scripts/package.py",
-    "publish": "python scripts/publish.py",
-    "package-publish": "npm run package && python scripts/publish.py",
-    "extract-release-notes": "python scripts/extract_release_notes.py",
-    "update-doc-links": "python scripts/update_doc_links.py",
-    "is-prerelease": "python scripts/is_prerelease.py"
+    "test": "node ./out/test/runTest.js"
   },
   "extensionDependencies": [
     "ms-python.python"

pyproject.toml

@@ -144,11 +144,25 @@ skip-install = true
 features = ["yaml", "rest", "lint", "tidy"]
 
 [tool.hatch.envs.lint.scripts]
-typing = "mypy --install-types --non-interactive {args:.}"
+typing = ["mypy --install-types --non-interactive {args:.}"]
 style = ["ruff {args:.}", "black --check --diff {args:.}"]
 fmt = ["black {args:.}", "ruff --fix {args:.}", "style"]
 all = ["style", "typing"]
 
+
+[tool.hatch.envs.build]
+detached = true
+python = "38"
+dependencies = ["GitPython", "semantic-version"]
+
+[tool.hatch.envs.build.scripts]
+update-git-versions = ["python scripts/update_git_versions.py"]
+update-doc-links = ["python scripts/update_doc_links.py"]
+package = ["python scripts/package.py"]
+publish = ["python scripts/publish.py"]
+extract-release-notes = ["python scripts/extract_release_notes.py"]
+is-prerelease = ["python scripts/is_prerelease.py"]
+
 [tool.semantic_release]
 version_variable = ["robotcode/__version__.py:__version__"]
 version_pattern = ['package.json:"version": "{version}"']

scripts/is_prerelease.py

@@ -1,3 +1,20 @@
+import contextlib
+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

@@ -1,6 +1,21 @@
+import contextlib
+import sys
 from pathlib import Path
 from subprocess import run
 
+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
 
 
@@ -13,7 +28,7 @@ def main() -> None:
         f"npx vsce package {'--pre-release' if get_version().prerelease else ''} -o ./dist", shell=True
     ).check_returncode()
 
-    run("poetry build", shell=True).check_returncode()
+    run("hatch -e build build", shell=True).check_returncode()
 
 
 if __name__ == "__main__":

scripts/tools.py

@@ -16,7 +16,7 @@ def get_current_version_from_git() -> Version:
     repo = Repo(Path.cwd())
 
     git_version = GitDescribeVersion(
-        *repo.git.describe("--tag", "--long", "--first-parent", "--match", "v[0-9]*").split("-")
+        *repo.git.describe("--tag", "--long", "--first-parent", "--match", "v[0-9]*").rsplit("-", 2)
     )
 
     version = Version(git_version.version[1:])

scripts/update_doc_links.py

@@ -1,6 +1,20 @@
+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/update_git_versions.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
 
 
@@ -13,20 +28,18 @@ def replace_in_file(filename: Path, pattern: "re.Pattern[str]", to: str) -> None
 def main() -> None:
     version = get_version()
 
-    preview = version.minor % 2 != 0
-
-    for f in ["robotcode/__version__.py", "pyproject.toml"]:
+    for f in ["robotcode/__version__.py"]:
         replace_in_file(
             Path(f),
             re.compile(r"""(^_*version_*\s*=\s*['"])([^'"]*)(['"])""", re.MULTILINE),
-            rf"\g<1>{version or ''}{'.dev.0' if preview and version.prerelease is None else ''}\g<3>",
+            rf"\g<1>{version or ''}\g<3>",
         )
 
     for f in ["package.json"]:
         replace_in_file(
             Path(f),
             re.compile(r"""(\"version\"\s*:\s*['"])([0-9]+\.[0-9]+\.[0-9]+.*)(['"])""", re.MULTILINE),
-            rf"\g<1>{version or ''}{'.dev.0' if preview and version.prerelease is None else ''}\g<3>",
+            rf"\g<1>{version or ''}\g<3>",
         )