Skip to content

Commit

Permalink
Merge branch 'main' into ipc_2581_padstack_instances
Browse files Browse the repository at this point in the history
  • Loading branch information
Alberto-DM committed Sep 19, 2023
2 parents 7ea1e2b + a381aba commit c407a59
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
filter_mode: nofilter
fail_on_error: true
vale_flags: "--config=doc/.vale.ini"

docs_build:
runs-on: ubuntu-20.04

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/full_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Create PDF Documentations
run: |
testenv\Scripts\Activate.ps1
sphinx-build -j auto --color -b pdf -a doc/source doc/_build/pdf
.\doc\make.bat pdf
- name: Upload HTML documentation artifact
uses: actions/upload-artifact@v3
Expand Down
7 changes: 7 additions & 0 deletions doc/make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ set SOURCEDIR=source
set BUILDDIR=_build

if "%1" == "" goto help
if "%1" == "pdf" goto pdf

%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
Expand All @@ -31,5 +32,11 @@ goto end
:help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%

:pdf
%SPHINXBUILD% -M latex %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
cd "%BUILDDIR%\latex"
for %%f in (*.tex) do (
pdflatex "%%f" --interaction=nonstopmode)

:end
popd
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ tests = [
"matplotlib==3.5.3; python_version <= '3.7'",
"matplotlib==3.7.3; python_version > '3.7'",
"numpy==1.21.6; python_version <= '3.9'",
"numpy==1.25.2; python_version > '3.9'",
"numpy==1.26.0; python_version > '3.9'",
"openpyxl==3.1.2",
"osmnx",
"pandas==1.3.5; python_version == '3.7'",
Expand Down Expand Up @@ -98,7 +98,7 @@ full = [
"matplotlib==3.5.3; python_version <= '3.7'",
"matplotlib==3.7.3; python_version > '3.7'",
"numpy==1.21.6; python_version <= '3.9'",
"numpy==1.25.2; python_version > '3.9'",
"numpy==1.26.0; python_version > '3.9'",
"pandas==1.3.5; python_version == '3.7'",
"pandas==2.0.3; python_version == '3.9'",
"pandas==2.0.3; python_version == '3.8'",
Expand All @@ -116,7 +116,7 @@ all = [
"matplotlib==3.5.3; python_version <= '3.7'",
"matplotlib==3.7.3; python_version > '3.7'",
"numpy==1.21.6; python_version <= '3.9'",
"numpy==1.25.2; python_version > '3.9'",
"numpy==1.26.0; python_version > '3.9'",
"pandas==1.3.5; python_version == '3.7'",
"pandas==2.0.3; python_version == '3.9'",
"pandas==2.0.3; python_version == '3.8'",
Expand Down

0 comments on commit c407a59

Please sign in to comment.