Skip to content

Commit 74aed07

Browse files
committed
Merge branch 'main' into enhance_sliding_dot_product
2 parents 3919b53 + ce05903 commit 74aed07

27 files changed

+189
-69
lines changed

.coveragerc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[run]
2+
omit =
3+
.venv/*
4+
.pixi/*

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
.pytest_cache
88
LOG*
99
PID
10-
.coverage*
10+
.coverage
1111
coverage.json
1212
coverage.stumpy.json
1313
dask-worker-space
@@ -22,3 +22,6 @@ docs/_build
2222
.directory
2323
test.py
2424
*.nbconvert.ipynb
25+
.pixi
26+
pixi.lock
27+
uv.lock

README.rst

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,18 +200,30 @@ Supported Python and NumPy versions are determined according to the `NEP 29 depr
200200
Where to get it
201201
---------------
202202

203-
Conda install (preferred):
203+
conda:
204204

205205
.. code:: bash
206206
207207
conda install -c conda-forge stumpy
208208
209-
PyPI install, presuming you have numpy, scipy, and numba installed:
209+
pip:
210210

211211
.. code:: bash
212212
213213
python -m pip install stumpy
214214
215+
pixi:
216+
217+
.. code:: bash
218+
219+
pixi add stumpy
220+
221+
uv:
222+
223+
.. code:: bash
224+
225+
uv add stumpy
226+
215227
To install stumpy from source, see the instructions in the `documentation <https://stumpy.readthedocs.io/en/latest/install.html>`__.
216228

217229
-------------

docs/api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
==========
2-
STUMPY API
3-
==========
1+
=============
2+
API Reference
3+
=============
44

55
Have A Question?
66
================
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
-----------------------
2-
Background & Motivation
3-
-----------------------
1+
----------
2+
Background
3+
----------
44

55
The following video provides the background and motivation for developing and open sourcing STUMPY:
66

docs/conf.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
# documentation.
110110
#
111111
html_theme_options = {
112+
"header_links_before_dropdown": 7,
112113
"icon_links": [
113114
{
114115
"name": "GitHub",
@@ -144,7 +145,9 @@
144145
# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
145146
# 'searchbox.html']``.
146147
#
147-
# html_sidebars = {}
148+
# html_sidebars = {
149+
# "**": []
150+
# }
148151

149152

150153
# -- Options for HTMLHelp output ---------------------------------------------

docs/help.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
------------
2-
Getting Help
3-
------------
1+
----
2+
Help
3+
----
44

5-
First, please check the `discussions <https://github.com/stumpy-dev/stumpy/discussions>`__ and `issues <https://github.com/stumpy-dev/stumpy/issues?utf8=%E2%9C%93&q=>`__ on Github to see if your question has already been answered there. If no solution is available there feel free to open a new discussion or issue and the authors will attempt to respond in a reasonably timely fashion.
5+
First, please check the `discussions <https://github.com/stumpy-dev/stumpy/discussions>`__ and `issues <https://github.com/stumpy-dev/stumpy/issues?utf8=%E2%9C%93&q=>`__ on Github to see if your question has already been answered there. If no solution is available there feel free to open a new discussion or issue and the developers will usually respond in a reasonable and timely fashion.

docs/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ STUMPY documentation
66
:maxdepth: 2
77
:caption: Contents:
88

9-
motivation
10-
install
9+
background
10+
Install <install>
1111
api
1212
tutorials
13-
Contribute.ipynb
13+
Contribute <Contribute.ipynb>
1414
help
1515

1616
.. include:: ../README.rst

docs/install.rst

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,32 @@ Installation
44

55
Supported Python and NumPy versions are determined according to the `NEP 29 deprecation policy <https://numpy.org/neps/nep-0029-deprecation_policy.html>`__.
66

7-
Using conda/pip
7+
Where to get it
88
===============
99

10-
Conda install (preferred):
10+
conda:
1111

1212
.. code:: bash
1313
1414
conda install -c conda-forge stumpy
1515
16-
PyPI install with ``pip``:
16+
pip:
1717

1818
.. code:: bash
1919
2020
python -m pip install stumpy
2121
22+
pixi:
23+
24+
.. code:: bash
25+
26+
pixi add stumpy
27+
28+
uv:
29+
30+
.. code:: bash
31+
32+
uv add stumpy
2233
2334
From source
2435
===========
@@ -30,20 +41,30 @@ To install stumpy from source, first clone the source repository:
3041
git clone https://github.com/stumpy-dev/stumpy.git
3142
cd stumpy
3243
33-
Next, you'll need to install the necessary dependencies. For maximum performance (or if you are installing stumpy for the Apple M1 ARM-based chip), it is recommended that you install all dependencies using `conda`:
44+
Next, you'll need to install the necessary dependencies:
45+
46+
conda:
3447

3548
.. code:: bash
3649
37-
conda install -c conda-forge -y numpy scipy numba
50+
conda install -c conda-forge -y --file requirements.txt
51+
python -m pip install .
3852
39-
Alternatively, but with lower performance, you can also install these dependencies using the requirements.txt file in the root of this repository:
53+
pip:
4054

4155
.. code:: bash
4256
4357
python -m pip install -r requirements.txt
58+
python -m pip install .
4459
45-
Once the dependencies are installed (stay inside of the ``stumpy`` directory), execute:
60+
pixi:
4661

4762
.. code:: bash
4863
49-
python -m pip install .
64+
pixi install
65+
66+
uv:
67+
68+
.. code:: bash
69+
70+
uv sync

doctest.sh

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

0 commit comments

Comments
 (0)