Skip to content

Commit 2adf27f

Browse files
committed
Merge branch 'master' into release
2 parents fa1086b + 37988a4 commit 2adf27f

File tree

14 files changed

+2050
-1627
lines changed

14 files changed

+2050
-1627
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
platform: [ubuntu-latest, macos-latest, windows-latest]
13-
python-version: ['3.8', '3.10', '3.11', '3.12']
13+
python-version: ['3.10', '3.11', '3.12', '3.13']
1414
defaults:
1515
run:
1616
shell: bash

.github/workflows/publish-pypi.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
deploy:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
- name: Set up Python
14-
uses: actions/setup-python@v2
14+
uses: actions/setup-python@v5
1515
with:
16-
python-version: '3.8'
16+
python-version: '3.11'
1717
- name: Install dependencies
1818
run: |
1919
python -m pip install poetry

.readthedocs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version: 2
99
build:
1010
os: ubuntu-22.04
1111
tools:
12-
python: "3.10"
12+
python: "3.11"
1313

1414
# Build documentation in the docs/ directory with Sphinx
1515
sphinx:

docs/_static/custom.css

+32-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,41 @@
1-
:root {
1+
html {
22
--pst-color-primary: 92, 92, 92;
3-
--pst-color-active-navigation: 231, 4, 136;
4-
--pst-color-navbar-link: 231, 4, 136;
5-
--pst-color-navbar-link-hover: 240, 40, 180;
6-
--pst-color-navbar-link-active: 231, 4, 136;
3+
--pst-color-active-navigation: #e70488;
4+
--pst-color-navbar-link: #e70488;
5+
--pst-color-navbar-link-active:#e70488;
6+
--pst-color-inline-code-links: #e70488;
77
}
88

9-
.navbar-light .navbar-nav>.active>.nav-link {
9+
h1 {
10+
--pst-color-heading: #150458;
11+
}
12+
13+
h2 {
14+
--pst-color-heading: #150458;
15+
}
16+
17+
h3 {
18+
--pst-color-heading: #150458;
19+
}
20+
21+
.bd-header ul.navbar-nav > li.nav-item > .nav-link {
22+
color: #e70488;
23+
--pst-color-primary: #e70488;
24+
}
25+
26+
.bd-header ul.navbar-nav > li.nav-item.current > .nav-link {
27+
color: #e70488;
28+
--pst-color-primary: #e70488;
1029
font-weight: 800;
11-
color: rgba(var(--pst-color-navbar-link-active),1);
1230
}
1331

32+
.bd-header ul.navbar-nav > li.nav-item > .nav-link:hover {
33+
color: #e70488;
34+
--pst-color-primary: #e70488;
35+
--pst-color-secondary: #ffffff;
36+
text-decoration: none;
37+
}
38+
1439
dt:target, span.highlighted {
1540
background-color: rgba(255,255,255,1);
1641
}

docs/conf.py

+23-6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# for sphinx
1919
import os
2020
import sys
21+
from datetime import datetime
2122

2223
currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
2324
parentdir = os.path.dirname(currentdir)
@@ -31,7 +32,7 @@
3132
# -- Project information -----------------------------------------------------
3233

3334
project = "piso"
34-
copyright = "2021, Riley Clement"
35+
copyright = f"2021-{datetime.now().year}, Riley Clement"
3536
author = "Riley Clement"
3637
version = piso.__version__
3738
if "untagged" in version:
@@ -64,10 +65,10 @@
6465
# "sphinx.ext.linkcode",
6566
"numpydoc", # handle NumPy documentation formatted docstrings]
6667
"nbsphinx",
67-
"sphinx_panels",
68+
"sphinx_design",
6869
]
6970

70-
source_suffix = [".rst", ".ipynb"]
71+
source_suffix = [".rst"]
7172

7273
# Add any paths that contain templates here, relative to this directory.
7374
templates_path = ["_templates"]
@@ -90,7 +91,7 @@
9091

9192
# sphinx-panels shouldn't add bootstrap css since the pydata-sphinx-theme
9293
# already loads it
93-
panels_add_bootstrap_css = False
94+
# panels_add_bootstrap_css = False
9495

9596
# The name of the Pygments (syntax highlighting) style to use.
9697
pygments_style = "sphinx"
@@ -121,10 +122,16 @@
121122
html_theme = "pydata_sphinx_theme"
122123

123124
html_theme_options = {
124-
"google_analytics_id": "UA-65430466-3",
125125
"github_url": "https://github.com/staircase-dev/piso",
126+
"navbar_end": ["navbar-icon-links"],
126127
}
127128

129+
html_theme_options["analytics"] = {
130+
"google_analytics_id": "UA-65430466-3",
131+
}
132+
133+
html_show_sourcelink = False
134+
128135

129136
html_logo = "img/piso_white.svg"
130137
html_favicon = "img/favicon.ico"
@@ -134,6 +141,16 @@
134141
# so a file named "default.css" will overwrite the builtin "default.css".
135142
html_static_path = ["_static"]
136143

144+
html_css_files = [
145+
"custom.css",
146+
]
147+
148+
html_context = {
149+
# ...
150+
"default_mode": "light"
151+
}
152+
137153

138154
def setup(app):
139-
app.add_css_file("custom.css")
155+
...
156+
# app.add_css_file("custom.css")

docs/general_requirements.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
ipykernel
2-
sphinx >= 5
2+
sphinx
33
nbsphinx
4-
sphinx-panels
4+
sphinx-design
55
staircase >= 2.1
66
pandas
77
numpy
88
Pygments
99
pydata-sphinx-theme
1010
toml
1111
numpydoc
12-
matplotlib >= 3.7
12+
matplotlib
13+
pickleshare

docs/getting_started/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ License
5252

5353
This project is licensed under the MIT License::
5454

55-
Copyright © 2021 <Riley Clement>
55+
Copyright © 2021-2025 <Riley Clement>
5656

5757
Permission is hereby granted, free of charge, to any person obtaining a copy of this
5858
software and associated documentation files (the “Software”), to deal in the Software

docs/release_notes/index.rst

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ Release notes
55
========================
66

77

8+
**v1.2.0 2025-01-02**
9+
10+
- support for Numpy 2 added
11+
- support for Python 3.13 added
12+
- support for Python 3.8 removed
13+
14+
815
**v1.1.0 2024-06-25**
916

1017
- support for Python 3.12 added

docs/requirements.txt

+55-54
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,87 @@
11
accessible-pygments==0.0.5
2-
alabaster==0.7.16
2+
alabaster==1.0.0
33
appnope==0.1.4
4-
asttokens==2.4.1
5-
attrs==23.2.0
6-
Babel==2.15.0
4+
asttokens==3.0.0
5+
attrs==24.3.0
6+
babel==2.16.0
77
beautifulsoup4==4.12.3
8-
bleach==6.1.0
9-
certifi==2024.6.2
10-
charset-normalizer==3.3.2
8+
bleach==6.2.0
9+
certifi==2024.12.14
10+
charset-normalizer==3.4.1
1111
comm==0.2.2
12-
contourpy==1.2.1
12+
contourpy==1.3.1
1313
cycler==0.12.1
14-
debugpy==1.8.1
14+
debugpy==1.8.11
1515
decorator==5.1.1
1616
defusedxml==0.7.1
1717
docutils==0.21.2
18-
executing==2.0.1
19-
fastjsonschema==2.20.0
20-
fonttools==4.53.0
21-
idna==3.7
18+
executing==2.1.0
19+
fastjsonschema==2.21.1
20+
fonttools==4.55.3
21+
idna==3.10
2222
imagesize==1.4.1
23-
ipykernel==6.29.4
24-
ipython==8.25.0
25-
jedi==0.19.1
26-
Jinja2==3.1.4
27-
jsonschema==4.22.0
28-
jsonschema-specifications==2023.12.1
29-
jupyter_client==8.6.2
23+
ipykernel==6.29.5
24+
ipython==8.31.0
25+
jedi==0.19.2
26+
Jinja2==3.1.5
27+
jsonschema==4.23.0
28+
jsonschema-specifications==2024.10.1
29+
jupyter_client==8.6.3
3030
jupyter_core==5.7.2
3131
jupyterlab_pygments==0.3.0
32-
kiwisolver==1.4.5
33-
MarkupSafe==2.1.5
34-
matplotlib==3.9.0
32+
kiwisolver==1.4.8
33+
MarkupSafe==3.0.2
34+
matplotlib==3.10.0
3535
matplotlib-inline==0.1.7
36-
mistune==3.0.2
37-
nbclient==0.10.0
36+
mistune==3.1.0
37+
nbclient==0.10.2
3838
nbconvert==7.16.4
3939
nbformat==5.10.4
40-
nbsphinx==0.9.4
40+
nbsphinx==0.9.6
4141
nest-asyncio==1.6.0
42-
numpy==1.26.4
43-
numpydoc==1.7.0
44-
packaging==24.1
45-
pandas==2.2.2
42+
numpy==2.2.1
43+
numpydoc==1.8.0
44+
packaging==24.2
45+
pandas==2.2.3
4646
pandocfilters==1.5.1
4747
parso==0.8.4
4848
pexpect==4.9.0
49-
pillow==10.3.0
50-
platformdirs==4.2.2
51-
prompt_toolkit==3.0.47
52-
psutil==6.0.0
49+
pickleshare==0.7.5
50+
pillow==11.0.0
51+
platformdirs==4.3.6
52+
prompt_toolkit==3.0.48
53+
psutil==6.1.1
5354
ptyprocess==0.7.0
54-
pure-eval==0.2.2
55-
pydata-sphinx-theme==0.15.3
55+
pure_eval==0.2.3
56+
pydata-sphinx-theme==0.16.1
5657
Pygments==2.18.0
57-
pyparsing==3.1.2
58+
pyparsing==3.2.1
5859
python-dateutil==2.9.0.post0
59-
pytz==2024.1
60-
pyzmq==26.0.3
60+
pytz==2024.2
61+
pyzmq==26.2.0
6162
referencing==0.35.1
6263
requests==2.32.3
63-
rpds-py==0.18.1
64-
six==1.16.0
64+
rpds-py==0.22.3
65+
six==1.17.0
6566
snowballstemmer==2.2.0
66-
soupsieve==2.5
67-
Sphinx==7.3.7
68-
sphinx-panels==0.4.1
69-
sphinxcontrib-applehelp==1.0.8
70-
sphinxcontrib-devhelp==1.0.6
71-
sphinxcontrib-htmlhelp==2.0.5
67+
soupsieve==2.6
68+
Sphinx==8.1.3
69+
sphinx_design==0.6.1
70+
sphinxcontrib-applehelp==2.0.0
71+
sphinxcontrib-devhelp==2.0.0
72+
sphinxcontrib-htmlhelp==2.1.0
7273
sphinxcontrib-jsmath==1.0.1
73-
sphinxcontrib-qthelp==1.0.7
74-
sphinxcontrib-serializinghtml==1.1.10
74+
sphinxcontrib-qthelp==2.0.0
75+
sphinxcontrib-serializinghtml==2.0.0
7576
stack-data==0.6.3
76-
staircase==2.6.0
77+
staircase==2.7.0
7778
tabulate==0.9.0
78-
tinycss2==1.3.0
79+
tinycss2==1.4.0
7980
toml==0.10.2
80-
tornado==6.4.1
81+
tornado==6.4.2
8182
traitlets==5.14.3
8283
typing_extensions==4.12.2
83-
tzdata==2024.1
84-
urllib3==2.2.2
84+
tzdata==2024.2
85+
urllib3==2.3.0
8586
wcwidth==0.2.13
8687
webencodings==0.5.1

0 commit comments

Comments
 (0)