Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(#479): improve value column conflict error #483

Merged
merged 3 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ repos:
"--extend-select",
"F841",
"--fix",
"--unsafe-fixes",
"--exit-non-zero-on-fix",
]
types_or: [ python, pyi, jupyter ]
Expand Down
1,309 changes: 481 additions & 828 deletions docs/tutorials/01_basic.ipynb

Large diffs are not rendered by default.

31 changes: 16 additions & 15 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,22 @@ classifiers = [
]
requires-python = ">=3.8.0,<3.13.0"
dependencies = [
"scipy>=1.8.0",
"scikit-learn>=1.1.2",
"pydantic>=2.0.0",
"pandas>=1.4.0,<=2.1.3",
"catalogue>=2.0.0",
"numpy>=1.23.3",
"pyarrow>=8.0.0",
"protobuf<=4.24.4",
# Other versions give errors with pytest, super weird!
"frozendict>=2.3.4",
"coloredlogs>14.0.0",
"tqdm>4.1.0",
"polars>0.18.0",
"iterpy==1.6.0",
"rich>=13.0.0",
"scipy>=1.8.0",
"scikit-learn>=1.1.2",
"pydantic>=2.0.0",
"pandas>=1.4.0,<=2.1.3",
"catalogue>=2.0.0",
"numpy>=1.23.3",
"pyarrow>=8.0.0",
"protobuf<=4.24.4",
# Other versions give errors with pytest, super weird!
"frozendict>=2.3.4",
"coloredlogs>14.0.0",
"tqdm>4.1.0",
"polars>0.18.0",
"iterpy==1.6.0",
"rich>=13.0.0",
"skimpy>=0.0.11",
]

[project.license]
Expand Down
121 changes: 121 additions & 0 deletions requirements-dev.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,89 @@
-e file:.
annotated-types==0.6.0
# via pydantic
appnope==0.1.4
# via ipykernel
asttokens==2.4.1
# via stack-data
attrs==23.2.0
# via jsonschema
# via pytest
# via referencing
# via sphobjinv
catalogue==2.0.10
# via timeseriesflattener
certifi==2024.2.2
# via sphobjinv
cffi==1.15.1
# via pytest-codspeed
click==8.1.7
# via quartodoc
# via skimpy
colorama==0.4.6
# via griffe
coloredlogs==15.0.1
# via timeseriesflattener
comm==0.2.1
# via ipykernel
coverage==7.4.1
# via pytest-cov
# via pytest-testmon
debugpy==1.8.1
# via ipykernel
decorator==5.1.1
# via ipython
exceptiongroup==1.2.0
# via ipython
# via pytest
execnet==2.0.2
# via pytest-xdist
executing==2.0.1
# via stack-data
filelock==3.12.4
# via pytest-codspeed
frozendict==2.4.0
# via timeseriesflattener
griffe==0.40.1
# via quartodoc
humanfriendly==10.0
# via coloredlogs
importlib-metadata==7.0.1
# via jupyter-client
# via quartodoc
# via typeguard
importlib-resources==6.1.1
# via quartodoc
iniconfig==2.0.0
# via pytest
invoke==2.1.1
ipykernel==6.29.2
# via skimpy
ipython==8.18.1
# via ipykernel
iterpy==1.6.0
# via timeseriesflattener
jedi==0.19.1
# via ipython
joblib==1.3.2
# via scikit-learn
jsonschema==4.21.1
# via sphobjinv
jsonschema-specifications==2023.12.1
# via jsonschema
jupyter-client==8.6.0
# via ipykernel
jupyter-core==5.7.1
# via ipykernel
# via jupyter-client
markdown-it-py==3.0.0
# via rich
matplotlib-inline==0.1.6
# via ipykernel
# via ipython
mdurl==0.1.2
# via markdown-it-py
nest-asyncio==1.6.0
# via ipykernel
nodeenv==1.8.0
# via pyright
numpy==1.26.4
Expand All @@ -50,31 +101,55 @@ numpy==1.26.4
# via pyarrow
# via scikit-learn
# via scipy
# via skimpy
# via timeseriesflattener
packaging==23.2
# via ipykernel
# via pytest
# via pytest-sugar
pandas==2.1.3
# via skimpy
# via timeseriesflattener
pandas-stubs==2.2.0.240218
parso==0.8.3
# via jedi
pexpect==4.9.0
# via ipython
platformdirs==4.2.0
# via jupyter-core
pluggy==1.4.0
# via pytest
plum-dispatch==1.7.4
# via quartodoc
polars==0.20.9
# via skimpy
# via timeseriesflattener
prompt-toolkit==3.0.43
# via ipython
protobuf==4.24.4
# via timeseriesflattener
psutil==5.9.8
# via ipykernel
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
# via stack-data
py-cpuinfo==9.0.0
# via pytest-benchmark
pyarrow==15.0.0
# via skimpy
# via timeseriesflattener
pycparser==2.21
# via cffi
pydantic==2.6.1
# via quartodoc
# via timeseriesflattener
pydantic-core==2.16.2
# via pydantic
pygments==2.17.2
# via ipython
# via rich
# via skimpy
pyright==1.1.330.post0
pytest==7.2.2
# via pytest-benchmark
Expand All @@ -90,11 +165,26 @@ pytest-sugar==0.9.7
pytest-testmon==2.1.0
pytest-xdist==3.1.0
python-dateutil==2.8.2
# via jupyter-client
# via pandas
pytz==2024.1
# via pandas
pyyaml==6.0.1
# via quartodoc
pyzmq==25.1.2
# via ipykernel
# via jupyter-client
quartodoc==0.7.2
# via skimpy
referencing==0.33.0
# via jsonschema
# via jsonschema-specifications
rich==13.7.0
# via skimpy
# via timeseriesflattener
rpds-py==0.18.0
# via jsonschema
# via referencing
ruff==0.2.2
scikit-learn==1.4.1.post1
# via timeseriesflattener
Expand All @@ -104,20 +194,51 @@ scipy==1.12.0
setuptools==69.1.0
# via nodeenv
six==1.16.0
# via asttokens
# via python-dateutil
skimpy==0.0.14
# via timeseriesflattener
sphobjinv==2.3.1
# via quartodoc
stack-data==0.6.3
# via ipython
tabulate==0.9.0
# via quartodoc
termcolor==2.4.0
# via pytest-sugar
threadpoolctl==3.3.0
# via scikit-learn
tomli==2.0.1
# via coverage
# via pytest
tornado==6.4
# via ipykernel
# via jupyter-client
tqdm==4.66.2
# via timeseriesflattener
traitlets==5.14.1
# via comm
# via ipykernel
# via ipython
# via jupyter-client
# via jupyter-core
# via matplotlib-inline
typeguard==4.1.5
# via skimpy
types-pytz==2024.1.0.20240203
# via pandas-stubs
typing-extensions==4.9.0
# via ipython
# via pydantic
# via pydantic-core
# via quartodoc
# via typeguard
tzdata==2024.1
# via pandas
watchdog==4.0.0
# via quartodoc
wcwidth==0.2.13
# via prompt-toolkit
zipp==3.17.0
# via importlib-metadata
# via importlib-resources
Loading
Loading