CI Cleanup (#1023)

* ci cleanup

* fix spelling

* bump min builder

* reinstate rtd stuff

* bump min pytest

* bump min pytest

Author: blink1073

.github/workflows/prep-release.yml

@@ -9,6 +9,9 @@ on:
       branch:
         description: "The branch to target"
         required: false
+      post_version_spec:
+        description: "Post Version Specifier"
+        required: false
       since:
         description: "Use PRs with activity since this date or git reference"
         required: false
@@ -18,33 +21,24 @@ on:
         type: boolean
 jobs:
   prep_release:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        python-version: ["3.10"]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup
-        uses: jupyter-server/jupyter-releaser/.github/actions/common@v2
+      - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
       - name: Prep Release
         id: prep-release
-        uses: jupyter-server/jupyter-releaser/.github/actions/prep-release@v2
+        uses: jupyter-server/jupyter_releaser/.github/actions/prep-release@v2
         with:
-          token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           version_spec: ${{ github.event.inputs.version_spec }}
           post_version_spec: ${{ github.event.inputs.post_version_spec }}
-          target: ${{ github.repository }}
+          target: ${{ github.event.inputs.target }}
           branch: ${{ github.event.inputs.branch }}
           since: ${{ github.event.inputs.since }}
           since_last_stable: ${{ github.event.inputs.since_last_stable }}
 
       - name: "** Next Step **"
         run: |
           echo "Optional): Review Draft Release: ${{ steps.prep-release.outputs.release_url }}"
-          echo "## Next Step" >> $GITHUB_STEP_SUMMARY
-          echo "(Optional): Review Draft Release: ${{ steps.prep-release.outputs.release_url }}" >> $GITHUB_STEP_SUMMARY
-          echo "Run Publish Release Workflow" >> $GITHUB_STEP_SUMMARY

.github/workflows/publish-release.yml

@@ -15,23 +15,17 @@ on:
 jobs:
   publish_release:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        python-version: ["3.10"]
+    permissions:
+      contents: write
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup
-        uses: jupyter-server/jupyter-releaser/.github/actions/common@v2
+      - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
       - name: Populate Release
         id: populate-release
-        uses: jupyter-server/jupyter-releaser/.github/actions/populate-release@v2
+        uses: jupyter-server/jupyter_releaser/.github/actions/populate-release@v2
         with:
-          token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
-          target: ${{ github.repository }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          target: ${{ github.event.inputs.target }}
           branch: ${{ github.event.inputs.branch }}
           release_url: ${{ github.event.inputs.release_url }}
           steps_to_skip: ${{ github.event.inputs.steps_to_skip }}
@@ -40,34 +34,23 @@ jobs:
         id: finalize-release
         env:
           PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+          PYPI_TOKEN_MAP: ${{ secrets.PYPI_TOKEN_MAP }}
           TWINE_USERNAME: __token__
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         uses: jupyter-server/jupyter-releaser/.github/actions/finalize-release@v2
         with:
-          token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
-          target: ${{ github.repository }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          target: ${{ github.event.inputs.target }}
           release_url: ${{ steps.populate-release.outputs.release_url }}
 
       - name: "** Next Step **"
         if: ${{ success() }}
         run: |
           echo "Verify the final release"
           echo ${{ steps.finalize-release.outputs.release_url }}
-          echo "## Next Step" >> $GITHUB_STEP_SUMMARY
-          echo "Verify the final release" >> $GITHUB_STEP_SUMMARY
-          echo ${{ steps.finalize-release.outputs.release_url }} >> $GITHUB_STEP_SUMMARY
-          if [ ! -z "${{ steps.finalize-release.outputs.pr_url }}" ]; then
-             echo "Merge the forwardport PR"
-             echo ${{ steps.finalize-release.outputs.pr_url }}
-             echo "Merge the forwardport PR" >> $GITHUB_STEP_SUMMARY
-             echo ${{ steps.finalize-release.outputs.pr_url }} >> $GITHUB_STEP_SUMMARY
-          fi
 
       - name: "** Failure Message **"
         if: ${{ failure() }}
         run: |
           echo "Failed to Publish the Draft Release Url:"
           echo ${{ steps.populate-release.outputs.release_url }}
-          echo "## Failure Message" >> $GITHUB_STEP_SUMMARY
-          echo ":x: Failed to Publish the Draft Release Url:" >> $GITHUB_STEP_SUMMARY
-          echo ${{ steps.populate-release.outputs.release_url }} >> $GITHUB_STEP_SUMMARY
-          echo "Fix credentials and run 'Publish Release' workflow again" >> $GITHUB_STEP_SUMMARY

jupyter_server/_version.py

@@ -6,7 +6,7 @@
 from typing import List
 
 # Version string must appear intact for automatic versioning
-__version__ = "2.0.0rc1"
+__version__ = "2.0.0.dev0"
 
 # Build up version_info tuple for backwards compatibility
 pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"

pyproject.toml

@@ -60,7 +60,7 @@ test = [
     "pytest-console-scripts",
     "pytest-timeout",
     "pytest-tornasync",
-    "pytest>=6.0",
+    "pytest>=7.0",
     "requests",
     "pre-commit"
 ]
@@ -108,18 +108,20 @@ test = "python -m pytest $ARGS --cov-fail-under 70 {args}"
 
 [tool.hatch.version]
 path = "jupyter_server/_version.py"
+validate-bump = false
 
 [tool.hatch.build]
 artifacts = ["jupyter_server/static/style"]
 
 [tool.hatch.build.hooks.jupyter-builder]
-dependencies = ["hatch-jupyter-builder>=0.7.1"]
+dependencies = ["hatch-jupyter-builder>=0.8"]
 build-function = "hatch_jupyter_builder.npm_builder"
 ensured-targets = [
   "jupyter_server/static/style/bootstrap.min.css",
   "jupyter_server/static/style/bootstrap-theme.min.css"
 ]
 install-pre-commit-hook = true
+optional-editable-build = true
 
 [tool.black]
 line_length = 100
@@ -152,7 +154,7 @@ before-build-python = ["npm install", "npm run build"]
 
 [tool.jupyter-releaser.options]
 pydist_resource_paths = ["jupyter_server/static/style/bootstrap.min.css", "jupyter_server/static/style/bootstrap-theme.min.css"]
-
+post-version-spec = "dev"
 
 [tool.mypy]
 check_untyped_defs = true