Skip to content

Commit a7becf3

Browse files
hbredinhbredin
committed
wip
1 parent 84be4af commit a7becf3

26 files changed

+1676
-2733
lines changed

‎.gitattributes‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
pyannote/pipeline/_version.py export-subst
21
doc/source/conf.py export-subst

‎.github/FUNDING.yml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/doc.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Documentation
2+
on:
3+
push:
4+
branches:
5+
- master
6+
7+
jobs:
8+
build-and-deploy:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
persist-credentials: false
15+
fetch-depth: 0
16+
- name: Install uv
17+
uses: astral-sh/setup-uv@v5
18+
with:
19+
enable-cache: true
20+
cache-dependency-glob: uv.lock
21+
22+
- name: Install the project
23+
run: uv sync --extra doc
24+
25+
- name: Build documentation
26+
run: |
27+
make --directory=doc html
28+
touch ./doc/build/html/.nojekyll
29+
- name: Deploy
30+
uses: peaceiris/actions-gh-pages@v3
31+
with:
32+
github_token: ${{ secrets.GITHUB_TOKEN }}
33+
publish_dir: ./doc/build/html

‎.github/workflows/pypi.yml‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎.github/workflows/publish.yml‎ renamed to ‎.github/workflows/release.yml‎

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111
- uses: actions/checkout@v4
1212
with:
1313
persist-credentials: false
14+
fetch-depth: 0
15+
- name: Install uv
16+
uses: astral-sh/setup-uv@v5
17+
with:
18+
enable-cache: true
19+
cache-dependency-glob: uv.lock
1420
- name: Set up Python
1521
uses: actions/setup-python@v5
1622
with:
17-
python-version: "3.x"
18-
- name: Install pypa/build
19-
run: >-
20-
python3 -m
21-
pip install
22-
build
23-
--user
24-
- name: Build a binary wheel and a source tarball
25-
run: python3 -m build
23+
python-version-file: ".python-version"
24+
- name: Build
25+
run: uv build
2626
- name: Store the distribution packages
2727
uses: actions/upload-artifact@v4
2828
with:
@@ -38,18 +38,22 @@ jobs:
3838
runs-on: ubuntu-latest
3939
environment:
4040
name: pypi
41-
url: https://pypi.org/p/pyannote.pipeline
4241
permissions:
43-
id-token: write # IMPORTANT: mandatory for trusted publishing
44-
42+
id-token: write
4543
steps:
4644
- name: Download all the dists
4745
uses: actions/download-artifact@v4
4846
with:
4947
name: python-package-distributions
5048
path: dist/
49+
- name: Install uv
50+
uses: astral-sh/setup-uv@v5
51+
with:
52+
enable-cache: true
53+
cache-dependency-glob: uv.lock
5154
- name: Publish distribution 📦 to PyPI
52-
uses: pypa/gh-action-pypi-publish@release/v1
55+
run: uv publish --trusted-publishing always --publish-url https://upload.pypi.org/legacy/
56+
5357

5458
github-release:
5559
name: >-
@@ -94,26 +98,28 @@ jobs:
9498
"$GITHUB_REF_NAME" dist/**
9599
--repo "$GITHUB_REPOSITORY"
96100
97-
publish-to-testpypi:
98-
name: Publish Python 🐍 distribution 📦 to TestPyPI
99-
needs:
100-
- build
101-
runs-on: ubuntu-latest
102-
103-
environment:
104-
name: testpypi
105-
url: https://test.pypi.org/p/pyannote.pipeline
106-
107-
permissions:
108-
id-token: write # IMPORTANT: mandatory for trusted publishing
109-
110-
steps:
111-
- name: Download all the dists
112-
uses: actions/download-artifact@v4
113-
with:
114-
name: python-package-distributions
115-
path: dist/
116-
- name: Publish distribution 📦 to TestPyPI
117-
uses: pypa/gh-action-pypi-publish@release/v1
118-
with:
119-
repository-url: https://test.pypi.org/legacy/
101+
# publish-to-testpypi:
102+
# name: Publish Python 🐍 distribution 📦 to TestPyPI
103+
# needs:
104+
# - build
105+
# runs-on: ubuntu-latest
106+
#
107+
# environment:
108+
# name: testpypi
109+
#
110+
# permissions:
111+
# id-token: write # IMPORTANT: mandatory for trusted publishing
112+
#
113+
# steps:
114+
# - name: Download all the dists
115+
# uses: actions/download-artifact@v4
116+
# with:
117+
# name: python-package-distributions
118+
# path: dist/
119+
# - name: Install uv
120+
# uses: astral-sh/setup-uv@v5
121+
# with:
122+
# enable-cache: true
123+
# cache-dependency-glob: uv.lock
124+
# - name: Publish distribution 📦 to PyPI
125+
# run: uv publish --trusted-publishing always --publish-url https://test.pypi.org/legacy/

‎.github/workflows/test.yml‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,35 @@ name: Test
22

33
on:
44
pull_request:
5-
branches:
5+
branches:
66
- develop
77
push:
8-
branches:
8+
branches:
99
- develop
1010
- master
1111
- release/*
1212

13-
jobs:
14-
build:
1513

14+
jobs:
15+
test:
16+
name: Test
1617
runs-on: ubuntu-latest
1718
strategy:
18-
max-parallel: 4
1919
matrix:
20-
python-version: [3.8]
21-
20+
python-version:
21+
- "3.10"
22+
- "3.11"
23+
- "3.12"
24+
env:
25+
UV_PYTHON: ${{ matrix.python-version }}
2226
steps:
23-
- uses: actions/checkout@v2
24-
- name: Set up Python ${{ matrix.python-version }}
25-
uses: actions/setup-python@v2
26-
with:
27-
python-version: ${{ matrix.python-version }}
28-
- name: Install from source
29-
run: |
30-
python -m pip install --upgrade pip
31-
pip install .
32-
- name: Test with pytest
33-
run: |
34-
pip install pytest
35-
pytest tests/
27+
- uses: actions/checkout@v4
28+
29+
- name: Install uv
30+
uses: astral-sh/setup-uv@v5
31+
32+
- name: Install the project
33+
run: uv sync --extra test
34+
35+
- name: Run tests
36+
run: uv run pytest tests

‎.python-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.10

‎MANIFEST.in‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎doc/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ BUILDDIR = build
1010

1111
# Put it first so that "make" without argument is like "make help".
1212
help:
13-
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
13+
uv run --extra doc $(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
1414

1515
.PHONY: help Makefile
1616

1717
# Catch-all target: route all unknown targets to Sphinx using the new
1818
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1919
%: Makefile
20-
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
20+
uv run --extra doc $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

‎doc/source/changelog.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Changelog
33
#########
44

5+
Unreleased
6+
~~~~~~~~~~
7+
8+
- BREAKING: drop support to `Python` < 3.10
9+
- BREAKING: switch to native namespace package
10+
- BREAKING: remove `pyannote.pipeline.blocks` submodule
11+
- setup: switch to `uv`
12+
513
Version 3.1.2 (2025-02-07)
614
~~~~~~~~~~~~~~~~~~~~~~~~~~
715

0 commit comments

Comments
 (0)