Skip to content

Unpin test requirements #5019

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

Merged
merged 47 commits into from
Mar 6, 2025
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
f356c8a
Unpin test requirements and use the same requirements for all python …
marthacryan Feb 7, 2025
27c0e9d
Remove extra requirements files
marthacryan Feb 7, 2025
fab49c7
remove plotly-geo install and orca tests from circleci config
marthacryan Feb 7, 2025
397b1ef
pin fiona version for python<=3.8
emilykl Feb 7, 2025
24fe0ee
Only install vaex for python<=3.9
marthacryan Feb 10, 2025
c2af57b
Prevent running vaex tests if vaex isn't installed
marthacryan Feb 10, 2025
7855fa6
Code formatting
marthacryan Feb 10, 2025
508135f
Update tests/test_optional/test_px/test_px_input.py
marthacryan Feb 11, 2025
7ca7295
try only running vaex with python 3.9
marthacryan Feb 11, 2025
71c6a95
Merge branch 'unpin-requirements' of github.com:plotly/plotly.py into…
marthacryan Feb 11, 2025
d282c49
Set vaex tests to run on only python 3.9
marthacryan Feb 11, 2025
ef4abb8
Only run vaex tests if vaex is installed
marthacryan Feb 11, 2025
f06ed71
Merge with master
marthacryan Feb 11, 2025
fe3740e
Fix handling of vaex not being present
marthacryan Feb 11, 2025
719292e
remove extraneous import of ipython display
marthacryan Feb 11, 2025
cae9d77
remove unnecessary py parameter and add numpy_installed parameter
marthacryan Feb 12, 2025
bcdc224
Update conditional in circleci config
marthacryan Feb 12, 2025
c493669
Fix syntax of conditional
marthacryan Feb 13, 2025
1367fa4
Fix conditional
marthacryan Feb 13, 2025
7095710
Parameterize jobs
marthacryan Feb 13, 2025
acc61b4
Fix python versions
marthacryan Feb 13, 2025
8c3bb2e
Fix indentation
marthacryan Feb 13, 2025
707bf68
Rename job for readability of CI output
marthacryan Feb 13, 2025
777e376
Switch to uv for other tests
marthacryan Feb 13, 2025
19e2c9a
Merge branch 'main' of github.com:plotly/plotly.py into unpin-require…
marthacryan Feb 13, 2025
f780164
Revert to pip for pandas downgrade
marthacryan Feb 13, 2025
f140060
Address review
marthacryan Feb 13, 2025
c9215f0
Revert changes to black version
marthacryan Feb 13, 2025
4664d15
Add pandas version as parameter
marthacryan Feb 13, 2025
d9c9c5e
Use pip for downgrade
marthacryan Feb 13, 2025
36c0437
Use easier to read name for jobs
marthacryan Feb 13, 2025
29f984b
Try different pandas version
marthacryan Feb 13, 2025
2a63724
Remove numpy config
marthacryan Feb 13, 2025
954db31
Prevent pandas install step if default
marthacryan Feb 18, 2025
396b066
Merge branch 'main' of github.com:plotly/plotly.py into unpin-require…
marthacryan Feb 18, 2025
60d8682
Remove narwhals from dependencies
marthacryan Feb 18, 2025
5e90e7d
Remove narwhals from core requirements
marthacryan Feb 20, 2025
cab519c
Update .circleci/config.yml
marthacryan Feb 26, 2025
c29f6a4
Add check for pandas version to confirm correct install
marthacryan Feb 26, 2025
e54f99c
Use uv for pip
marthacryan Feb 26, 2025
2750aa0
Add numpy version pin
marthacryan Mar 6, 2025
53dc043
Switch to use uv in core tests as well
marthacryan Mar 6, 2025
f5c2bec
Use uv for percy tests
marthacryan Mar 6, 2025
d3de0b1
Use later version of numpy for scipy compatibility
marthacryan Mar 6, 2025
b89f793
Use version of numpy from before switch to uv
marthacryan Mar 6, 2025
0a74d1b
Use different version of numpy
marthacryan Mar 6, 2025
801dde1
Update name of test for consistency with other CI jobs
marthacryan Mar 6, 2025
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
55 changes: 3 additions & 52 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ commands:
python -m venv venv
. venv/bin/activate
pip install -e .
pip install -r ./test_requirements/requirements_<<parameters.py>>_core.txt
pip install -r ./test_requirements/requirements_core.txt
- run:
name: Test core
command: |
Expand All @@ -42,15 +42,10 @@ commands:
python -m venv venv
. venv/bin/activate
pip install -e .
pip install -r ./test_requirements/requirements_<<parameters.py>>_optional.txt
pip install -r ./test_requirements/requirements_optional.txt
cd js
npm ci
npm run build
- run:
name: Install plotly-geo
command: |
. venv/bin/activate
pip install plotly-geo
- run:
name: Test core
command: |
Expand Down Expand Up @@ -85,42 +80,6 @@ commands:
command: |
. venv/bin/activate
python -m pytest -x test_init/test_lazy_imports.py
test_orca:
parameters:
py:
default: "310"
type: string
steps:
- checkout
- browser-tools/install-chrome
- browser-tools/install-chromedriver
- run:
name: Install dependencies
command: |
python -m venv venv
. venv/bin/activate
pip install -r ./test_requirements/requirements_<<parameters.py>>_optional.txt
- run:
name: Install plotly-geo
command: |
. venv/bin/activate
pip install plotly-geo
- run:
name: Install orca
command: |
npm install [email protected]
npm install orca
sudo apt-get update
sudo apt-get install -y poppler-utils libxtst6 xvfb libgtk2.0-0 libgconf-2-4 libnss3 libasound2 rename
echo 'export PATH="/home/circleci/project/node_modules/.bin:$PATH"' >> $BASH_ENV
- run:
name: Test orca
command: |
. venv/bin/activate
pytest tests/test_orca
no_output_timeout: 20m
- store_artifacts:
path: tests/test_orca/images/linux/failed

jobs:
check-code-formatting:
Expand Down Expand Up @@ -310,7 +269,7 @@ jobs:
python -m venv venv
. venv/bin/activate
pip install -e .
pip install -r ./test_requirements/requirements_311_core.txt black inflect
pip install -r ./test_requirements/requirements_core.txt black inflect
pip install jupyterlab
- run:
name: Update plotly.js to dev
Expand Down Expand Up @@ -417,14 +376,6 @@ jobs:
cd ../doc
fi
cd ..
- run:
name: Install orca
command: |
npm install [email protected]
npm install orca
sudo apt-get update
sudo apt-get install -y poppler-utils libxtst6 xvfb libgtk2.0-0 libgconf-2-4 libnss3 libasound2 rename
echo 'export PATH="/home/circleci/project/node_modules/.bin:$PATH"' >> $BASH_ENV

- save_cache:
paths:
Expand Down
3 changes: 0 additions & 3 deletions test_requirements/requirements_310_core.txt

This file was deleted.

24 changes: 0 additions & 24 deletions test_requirements/requirements_310_optional.txt

This file was deleted.

3 changes: 0 additions & 3 deletions test_requirements/requirements_311_core.txt

This file was deleted.

25 changes: 0 additions & 25 deletions test_requirements/requirements_311_optional.txt

This file was deleted.

3 changes: 0 additions & 3 deletions test_requirements/requirements_312_core.txt

This file was deleted.

26 changes: 0 additions & 26 deletions test_requirements/requirements_312_optional.txt

This file was deleted.

3 changes: 0 additions & 3 deletions test_requirements/requirements_38_core.txt

This file was deleted.

24 changes: 0 additions & 24 deletions test_requirements/requirements_38_optional.txt

This file was deleted.

3 changes: 0 additions & 3 deletions test_requirements/requirements_39_core.txt

This file was deleted.

25 changes: 0 additions & 25 deletions test_requirements/requirements_39_optional.txt

This file was deleted.

3 changes: 3 additions & 0 deletions test_requirements/requirements_core.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
requests
pytest
narwhals
27 changes: 27 additions & 0 deletions test_requirements/requirements_optional.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
requests
pandas
numpy
fiona<=1.9.6;python_version<="3.8"
xarray
statsmodels
Pillow
pytest
pytz
ipython[all]
ipykernel
jupyter
scipy
Shapely
geopandas
pyshp
matplotlib
scikit-image
psutil
kaleido
orjson
polars[timezone]
pyarrow
narwhals
anywidget
plotly-geo
vaex;python_version<="3.9"
3 changes: 1 addition & 2 deletions tests/test_optional/test_px/test_px_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
import warnings


# FIXME: don't test with vaex if vaex isn't installed
if (optional_imports.get_module("vaex") is None) and (sys.version_info >= (3, 12)):
if optional_imports.get_module("vaex") is None:
TEST_LIBS = ["polars"]
else:
TEST_LIBS = ["vaex", "polars"]
Expand Down