From 07dbe56cb00d7f7f055f82b32289f57c8a7cddcd Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 21 Oct 2024 18:36:38 +0200 Subject: [PATCH 1/3] pin pandas and remove twine --- requirements-dev.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index f35857e802..4c416c539f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ nbconvert nbsphinx nbval owslib -pandas +pandas >=2 pillow pre-commit pycodestyle @@ -33,7 +33,6 @@ scipy selenium setuptools_scm sphinx -twine>=3.2.0 types-requests vega_datasets vincent From e6c223680183b37706e9bbe23a67561fac69116a Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 21 Oct 2024 18:41:34 +0200 Subject: [PATCH 2/3] remove py38 and add py313 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bb33f689a3..836764fc2f 100644 --- a/setup.py +++ b/setup.py @@ -52,11 +52,11 @@ def walk_subpkg(name): url="https://github.com/python-visualization/folium", keywords="data visualization", classifiers=[ - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Scientific/Engineering :: GIS", "Topic :: Scientific/Engineering :: Visualization", "License :: OSI Approved :: MIT License", From 8bb47661983b2e404d6099edd52696500a20eb73 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 21 Oct 2024 18:41:49 +0200 Subject: [PATCH 3/3] run tests on py313 --- .github/workflows/test_code.yml | 11 +---------- .github/workflows/test_selenium.yml | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml index ff644d600a..ee75fe41e3 100644 --- a/.github/workflows/test_code.yml +++ b/.github/workflows/test_code.yml @@ -12,12 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.9", "3.12"] - experimental: [false] - include: - - python-version: "3.12" - os: "ubuntu-latest" - experimental: true + python-version: ["3.9", "3.13"] fail-fast: false defaults: run: @@ -35,10 +30,6 @@ jobs: --file requirements.txt --file requirements-dev.txt - - name: Install nightly versions of dependencies - if: matrix.experimental == true - run: python -m pip install --pre --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple --extra-index-url https://pypi.org/simple numpy pandas shapely -U - - name: Install folium from source run: python -m pip install -e . --no-deps --force-reinstall diff --git a/.github/workflows/test_selenium.yml b/.github/workflows/test_selenium.yml index 6aa70fe87a..34cd054305 100644 --- a/.github/workflows/test_selenium.yml +++ b/.github/workflows/test_selenium.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ "3.9", "3.12" ] + python-version: [ "3.9", "3.13" ] fail-fast: false steps: