Skip to content

Commit 2114e7f

Browse files
committed
Merge remote-tracking branch 'skeleton/main' into range_normalization
2 parents fa7009a + 5c3e935 commit 2114e7f

9 files changed

Lines changed: 143 additions & 360 deletions

File tree

.github/workflows/docs-ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
build:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88

99
strategy:
1010
max-parallel: 4
@@ -20,9 +20,6 @@ jobs:
2020
with:
2121
python-version: ${{ matrix.python-version }}
2222

23-
- name: Give permission to run scripts
24-
run: chmod +x ./docs/scripts/doc8_style_check.sh
25-
2623
- name: Install Dependencies
2724
run: pip install -e .[docs]
2825

.github/workflows/pypi-release.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
jobs:
88
build-and-publish-to-pypi:
99
name: Build and publish library to PyPI
10+
<<<<<<< HEAD
1011
runs-on: ubuntu-20.04
1112
steps:
1213
- uses: actions/checkout@master
@@ -25,3 +26,65 @@ jobs:
2526
with:
2627
password: ${{ secrets.PYPI_API_TOKEN }}
2728

29+
=======
30+
runs-on: ubuntu-22.04
31+
32+
steps:
33+
- uses: actions/checkout@v4
34+
- name: Set up Python
35+
uses: actions/setup-python@v4
36+
with:
37+
python-version: 3.9
38+
39+
- name: Install pypa/build
40+
run: python -m pip install build --user
41+
42+
- name: Build a binary wheel and a source tarball
43+
run: python -m build --sdist --wheel --outdir dist/
44+
45+
- name: Upload built archives
46+
uses: actions/upload-artifact@v3
47+
with:
48+
name: pypi_archives
49+
path: dist/*
50+
51+
52+
create-gh-release:
53+
name: Create GH release
54+
needs:
55+
- build-pypi-distribs
56+
runs-on: ubuntu-22.04
57+
58+
steps:
59+
- name: Download built archives
60+
uses: actions/download-artifact@v3
61+
with:
62+
name: pypi_archives
63+
path: dist
64+
65+
- name: Create GH release
66+
uses: softprops/action-gh-release@v1
67+
with:
68+
draft: true
69+
files: dist/*
70+
71+
72+
create-pypi-release:
73+
name: Create PyPI release
74+
needs:
75+
- create-gh-release
76+
runs-on: ubuntu-22.04
77+
78+
steps:
79+
- name: Download built archives
80+
uses: actions/download-artifact@v3
81+
with:
82+
name: pypi_archives
83+
path: dist
84+
85+
- name: Publish to PyPI
86+
if: startsWith(github.ref, 'refs/tags')
87+
uses: pypa/gh-action-pypi-publish@release/v1
88+
with:
89+
password: ${{ secrets.PYPI_API_TOKEN }}
90+
>>>>>>> skeleton/main

azure-pipelines.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
parameters:
1212
job_name: ubuntu20_cpython
1313
image_name: ubuntu-20.04
14-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
14+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
1515
test_suites:
1616
all: |
1717
source venv/bin/activate
@@ -21,6 +21,7 @@ jobs:
2121
parameters:
2222
job_name: ubuntu22_cpython
2323
image_name: ubuntu-22.04
24+
<<<<<<< HEAD
2425
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
2526
test_suites:
2627
all: |
@@ -32,6 +33,9 @@ jobs:
3233
job_name: macos11_cpython
3334
image_name: macOS-11
3435
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
36+
=======
37+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
38+
>>>>>>> skeleton/main
3539
test_suites:
3640
all: |
3741
source venv/bin/activate
@@ -41,7 +45,7 @@ jobs:
4145
parameters:
4246
job_name: macos12_cpython
4347
image_name: macOS-12
44-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
48+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
4549
test_suites:
4650
all: |
4751
source venv/bin/activate
@@ -51,7 +55,23 @@ jobs:
5155
parameters:
5256
job_name: macos13_cpython
5357
image_name: macOS-13
54-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
58+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
59+
test_suites:
60+
all: venv/bin/pytest -n 2 -vvs
61+
62+
- template: etc/ci/azure-posix.yml
63+
parameters:
64+
job_name: macos14_cpython_arm64
65+
image_name: macOS-14
66+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
67+
test_suites:
68+
all: venv/bin/pytest -n 2 -vvs
69+
70+
- template: etc/ci/azure-posix.yml
71+
parameters:
72+
job_name: macos14_cpython
73+
image_name: macOS-14-large
74+
python_versions: ['3.8', '3.8', '3.9', '3.10', '3.12']
5575
test_suites:
5676
all: |
5777
source venv/bin/activate
@@ -61,7 +81,7 @@ jobs:
6181
parameters:
6282
job_name: win2019_cpython
6383
image_name: windows-2019
64-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
84+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
6585
test_suites:
6686
all: |
6787
call venv\Scripts\activate.bat
@@ -71,7 +91,7 @@ jobs:
7191
parameters:
7292
job_name: win2022_cpython
7393
image_name: windows-2022
74-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
94+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
7595
test_suites:
7696
all: |
7797
call venv\Scripts\activate.bat

docs/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# from the environment for the first two.
66
SPHINXOPTS ?=
77
SPHINXBUILD ?= sphinx-build
8+
SPHINXAUTOBUILD = sphinx-autobuild
89
SOURCEDIR = source
910
BUILDDIR = build
1011

@@ -14,6 +15,13 @@ help:
1415

1516
.PHONY: help Makefile
1617

18+
# Run the development server using sphinx-autobuild
19+
docs:
20+
@echo
21+
@echo "Starting up the docs server..."
22+
@echo
23+
$(SPHINXAUTOBUILD) --port 8000 --watch ${SOURCEDIR} $(SOURCEDIR) "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)
24+
1725
# Catch-all target: route all unknown targets to Sphinx using the new
1826
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1927
%: Makefile

docs/make.bat

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,16 @@ REM Command file for Sphinx documentation
77
if "%SPHINXBUILD%" == "" (
88
set SPHINXBUILD=sphinx-build
99
)
10+
if "%SPHINXAUTOBUILD%" == "" (
11+
set SPHINXAUTOBUILD=sphinx-autobuild
12+
)
1013
set SOURCEDIR=source
1114
set BUILDDIR=build
1215

1316
if "%1" == "" goto help
1417

18+
if "%1" == "docs" goto docs
19+
1520
%SPHINXBUILD% >NUL 2>NUL
1621
if errorlevel 9009 (
1722
echo.
@@ -28,6 +33,13 @@ if errorlevel 9009 (
2833
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
2934
goto end
3035

36+
:docs
37+
@echo
38+
@echo Starting up the docs server...
39+
@echo
40+
%SPHINXAUTOBUILD% --port 8000 --watch %SOURCEDIR% %SOURCEDIR% %BUILDDIR%\html %SPHINXOPTS% %O%
41+
goto end
42+
3143
:help
3244
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
3345

docs/scripts/doc8_style_check.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)