From 23d94b2c148088c8305e1e54c8a83a479cb69b9b Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 14 Nov 2023 01:23:23 +0530 Subject: [PATCH 1/4] Add pyproject.toml + test building wheel --- .github/workflows/release.yaml | 44 ++++++++++++++++++++++++++++++++++ pyproject.toml | 21 ++++++++++++++++ setup.py | 13 ---------- 3 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/release.yaml create mode 100644 pyproject.toml delete mode 100644 setup.py diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..7a493a5 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,44 @@ +name: Release + +# Always tests wheel building, but only publish to PyPI on pushed tags. +on: + pull_request: + paths-ignore: + - ".github/workflows/*.yaml" + - "!.github/workflows/release.yaml" + push: + paths-ignore: + - ".github/workflows/*.yaml" + - "!.github/workflows/release.yaml" + branches-ignore: + - "dependabot/**" + - "pre-commit-ci-update-config" + tags: ["**"] + workflow_dispatch: + +jobs: + build-release: + runs-on: ubuntu-22.04 + permissions: + id-token: write + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: "3.11" + + - name: install build package + run: | + pip install --upgrade pip + pip install build + pip freeze + + - name: build release + run: | + python -m build --sdist --wheel . + ls -l dist + + - name: publish to pypi + uses: pypa/gh-action-pypi-publish@release/v1 + if: startsWith(github.ref, 'refs/tags/') diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..44c095e --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,21 @@ +[build-system] +requires = ["setuptools>=64", "setuptools_scm>=8"] +build-backend = "setuptools.build_meta" + +[project] +name = "jupyterhub-fancy-profiles" +dynamic = ["version"] +authors = [ + {name = "Yuvi", email = "yuvipanda@gmail.com"}, +] +description = "Fancy Profile UI for jupyterhub-kubespawner" +keywords = ["jupyterhub"] +readme = "README.md" +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: BSD License", + "Operating System :: OS Independent", +] + +[tool.setuptools_scm] +version_file = "jupyterhub_fancy_profiles/_version.py" \ No newline at end of file diff --git a/setup.py b/setup.py deleted file mode 100644 index 3f4a68e..0000000 --- a/setup.py +++ /dev/null @@ -1,13 +0,0 @@ -from setuptools import find_packages, setup - -setup( - name="jupyterhub-fancy-profiles", - version="1.0.0", - description="UI that plugs into kubespawner profile list for", - url="https://github.com/yuvipanda/jupyterhub-fancy-profiles", - author="Yuvi Panda", - author_email="yuvipanda@gmail.com", - license="3 Clause BSD", - packages=find_packages(), - include_package_data=True, -) From 79460f51a07c871d699903713176ffc89ac3eb68 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 14 Nov 2023 01:24:25 +0530 Subject: [PATCH 2/4] Only run push on to main The PR stanza runs for everything else --- .github/workflows/release.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7a493a5..e124a42 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,12 +7,8 @@ on: - ".github/workflows/*.yaml" - "!.github/workflows/release.yaml" push: - paths-ignore: - - ".github/workflows/*.yaml" - - "!.github/workflows/release.yaml" - branches-ignore: - - "dependabot/**" - - "pre-commit-ci-update-config" + branches: + - "main" tags: ["**"] workflow_dispatch: From 6fd79e80055f1e0640759fe20cdfed47856d887f Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 14 Nov 2023 01:27:21 +0530 Subject: [PATCH 3/4] Fetch full history of git repo --- .github/workflows/release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e124a42..ecface7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,6 +20,9 @@ jobs: steps: - uses: actions/checkout@v3 + with: + # Fetch full history so we don't run into trouble with setuptools_scm + fetch-depth: 0 - uses: actions/setup-python@v4 with: python-version: "3.11" From 5ec59ee743726760bd213bc91ead36f2a31a2f01 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 20:16:28 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 44c095e..8b1c3ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,4 +18,4 @@ classifiers = [ ] [tool.setuptools_scm] -version_file = "jupyterhub_fancy_profiles/_version.py" \ No newline at end of file +version_file = "jupyterhub_fancy_profiles/_version.py"