Skip to content

Commit fe35a34

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

9 files changed

Lines changed: 78 additions & 372 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Python
1414
uses: actions/setup-python@v1
1515
with:
16-
python-version: 3.8
16+
python-version: 3.9
1717
- name: Install pypa/build
1818
run: python -m pip install build --user
1919
- name: Build a binary wheel and a source tarball

azure-pipelines.yml

Lines changed: 22 additions & 16 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,17 +21,7 @@ jobs:
2121
parameters:
2222
job_name: ubuntu22_cpython
2323
image_name: ubuntu-22.04
24-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
25-
test_suites:
26-
all: |
27-
source venv/bin/activate
28-
pytest -n 2 -vvs
29-
30-
- template: etc/ci/azure-posix.yml
31-
parameters:
32-
job_name: macos11_cpython
33-
image_name: macOS-11
34-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
24+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
3525
test_suites:
3626
all: |
3727
source venv/bin/activate
@@ -41,7 +31,7 @@ jobs:
4131
parameters:
4232
job_name: macos12_cpython
4333
image_name: macOS-12
44-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
34+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
4535
test_suites:
4636
all: |
4737
source venv/bin/activate
@@ -51,7 +41,23 @@ jobs:
5141
parameters:
5242
job_name: macos13_cpython
5343
image_name: macOS-13
54-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
44+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
45+
test_suites:
46+
all: venv/bin/pytest -n 2 -vvs
47+
48+
- template: etc/ci/azure-posix.yml
49+
parameters:
50+
job_name: macos14_cpython_arm64
51+
image_name: macOS-14
52+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
53+
test_suites:
54+
all: venv/bin/pytest -n 2 -vvs
55+
56+
- template: etc/ci/azure-posix.yml
57+
parameters:
58+
job_name: macos14_cpython
59+
image_name: macOS-14-large
60+
python_versions: ['3.8', '3.8', '3.9', '3.10', '3.12']
5561
test_suites:
5662
all: |
5763
source venv/bin/activate
@@ -61,7 +67,7 @@ jobs:
6167
parameters:
6268
job_name: win2019_cpython
6369
image_name: windows-2019
64-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
70+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
6571
test_suites:
6672
all: |
6773
call venv\Scripts\activate.bat
@@ -71,7 +77,7 @@ jobs:
7177
parameters:
7278
job_name: win2022_cpython
7379
image_name: windows-2022
74-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
80+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
7581
test_suites:
7682
all: |
7783
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)