Skip to content

Commit

Permalink
asdf
Browse files Browse the repository at this point in the history
  • Loading branch information
consideRatio committed May 31, 2023
1 parent 251bc57 commit 9e0ea1b
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 40 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/publish.yml

This file was deleted.

54 changes: 54 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# This is a GitHub workflow defining a set of jobs with a set of steps.
# ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
#
name: Release

# Always tests wheel building, but only publish to PyPI on pushed tags.
on:
pull_request:
paths-ignore:
- "docs/**"
- ".github/workflows/*.yaml"
- "!.github/workflows/release.yaml"
push:
paths-ignore:
- "docs/**"
- ".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 is required for pypa/gh-action-pypi-publish, and the PyPI
# project needs to be configured to trust this workflow.
#
# ref: https://github.com/jupyterhub/team-compass/issues/648
#
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/')
12 changes: 8 additions & 4 deletions .github/workflows/test.yml → .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ jobs:
pip-install-spec: "jupyterhub==4.*"
- python-version: "3.11"
pip-install-spec: "jupyterhub==4.*"
test-variation: internal-ssl
- python-version: "3.11"
pip-install-spec: "jupyterhub==4.*"
test-variation: podman

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -68,18 +72,18 @@ jobs:
npm install -g configurable-http-proxy
- name: Run tests
if: matrix.test != 'internal-ssl' && matrix.test != 'podman'
if: matrix.test-variation == ''
run: |
pytest tests --cov=dockerspawner
- name: Run examples/internal-ssl tests
if: matrix.test == 'internal-ssl'
if: matrix.test-variation == 'internal-ssl'
run: |
cd examples/internal-ssl
pytest -vsx
- name: Prepare for user-mode podman tests
if: matrix.test == 'podman'
if: matrix.test-variation == 'podman'
run: |
sudo systemctl stop docker
# Default is unix://$XDG_RUNTIME_DIR/podman/podman.sock but XDG_RUNTIME_DIR may not be set
Expand All @@ -95,7 +99,7 @@ jobs:
docker ps
- name: Run user-mode podman tests
if: matrix.test == 'podman'
if: matrix.test-variation == 'podman'
run: |
pytest tests/test_dockerspawner.py --cov=dockerspawner
Expand Down
1 change: 0 additions & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
codecov
netifaces
notebook<7
pyflakes
Expand Down

0 comments on commit 9e0ea1b

Please sign in to comment.