Skip to content

Commit 129b0d5

Browse files
ConengmoConengmo
committed
Merge remote-tracking branch 'upstream/main' into draggable-layer-control
2 parents d2a1224 + 14c9d26 commit 129b0d5

16 files changed

Lines changed: 1097 additions & 443 deletions

‎.github/workflows/deploy-docs.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v3
1717

18-
- name: Setup Micromamba
19-
uses: mamba-org/provision-with-micromamba@v15
18+
- name: Setup Micromamba env
19+
uses: mamba-org/setup-micromamba@v1
2020
with:
21-
environment-file: false
21+
environment-name: TEST
22+
create-args: >-
23+
python=3
24+
--file requirements.txt
25+
--file requirements-dev.txt
2226
23-
- name: Create environment
27+
- name: Install folium from source
2428
shell: bash -l {0}
25-
run: |
26-
micromamba create --name TEST python=3 --file requirements.txt --file requirements-dev.txt --channel conda-forge
27-
micromamba activate TEST
28-
pip install -e . --no-deps --force-reinstall
29+
run: python -m pip install -e . --no-deps --force-reinstall
2930

3031
- name: Build documentation
3132
shell: bash -l {0}
3233
run: |
3334
set -e
34-
micromamba activate TEST
3535
cp examples/Quickstart.ipynb docs/quickstart.ipynb
3636
pushd docs
3737
make clean html linkcheck

‎.github/workflows/test_code.yml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,25 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-latest, windows-latest]
11-
python-version: ["3.7", "3.11"]
11+
python-version: ["3.8", "3.11"]
1212
fail-fast: false
1313

1414
steps:
1515
- uses: actions/checkout@v3
1616

17-
- name: Setup Micromamba
18-
uses: mamba-org/provision-with-micromamba@v15
17+
- name: Setup Micromamba env
18+
uses: mamba-org/setup-micromamba@v1
1919
with:
20-
environment-file: false
20+
environment-name: TEST
21+
create-args: >-
22+
python=${{ matrix.python-version }}
23+
--file requirements.txt
24+
--file requirements-dev.txt
2125
22-
- name: Python ${{ matrix.python-version }}
26+
- name: Install folium from source
2327
shell: bash -l {0}
24-
run: |
25-
micromamba create --name TEST python=${{ matrix.python-version }} --file requirements.txt --file requirements-dev.txt --channel conda-forge
26-
micromamba activate TEST
27-
python -m pip install -e . --no-deps --force-reinstall
28+
run: python -m pip install -e . --no-deps --force-reinstall
2829

29-
- name: Tests
30+
- name: Code tests
3031
shell: bash -l {0}
31-
run: |
32-
micromamba activate TEST
33-
python -m pytest -vv --ignore=tests/selenium
32+
run: python -m pytest -vv --ignore=tests/selenium

‎.github/workflows/test_code_notebooks.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v3
1111

12-
- name: Setup Micromamba
13-
uses: mamba-org/provision-with-micromamba@v15
12+
- name: Setup Micromamba env
13+
uses: mamba-org/setup-micromamba@v1
1414
with:
15-
environment-file: false
15+
environment-name: TEST
16+
create-args: >-
17+
python=3
18+
--file requirements.txt
19+
--file requirements-dev.txt
1620
17-
- name: Create env
21+
- name: Install folium from source
1822
shell: bash -l {0}
19-
run: |
20-
micromamba create --name TEST python=${{ matrix.python-version }} --file requirements.txt --file requirements-dev.txt --channel conda-forge
21-
micromamba activate TEST
22-
python -m pip install -e . --no-deps --force-reinstall
23+
run: python -m pip install -e . --no-deps --force-reinstall
2324

2425
- name: Notebook tests
2526
shell: bash -l {0}
26-
run: |
27-
micromamba activate TEST
28-
python -m pytest --nbval-lax examples
27+
run: python -m pytest --nbval-lax examples --ignore=examples/WmsTimeDimension.ipynb

‎.github/workflows/test_latest_branca.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v3
1111

12-
- name: Setup Micromamba
13-
uses: mamba-org/provision-with-micromamba@v15
12+
- name: Setup Micromamba env
13+
uses: mamba-org/setup-micromamba@v1
1414
with:
15-
environment-file: false
15+
environment-name: TEST
16+
create-args: >-
17+
python=3
18+
--file requirements.txt
19+
--file requirements-dev.txt
1620
17-
- name: Python 3.x
21+
- name: Install folium from source
1822
shell: bash -l {0}
19-
run: |
20-
micromamba create --name TEST python=${{ matrix.python-version }} --file requirements.txt --file requirements-dev.txt --channel conda-forge
21-
micromamba activate TEST
22-
python -m pip install -e . --no-deps --force-reinstall
23+
run: python -m pip install -e . --no-deps --force-reinstall
2324

2425
- name: Tests with latest branca
2526
shell: bash -l {0}
2627
run: |
27-
micromamba activate TEST
2828
micromamba remove branca --yes --force
2929
python -m pip install git+https://github.com/python-visualization/branca.git
3030
python -m pytest -vv --ignore=tests/selenium

‎.github/workflows/test_mypy.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,21 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v3
1111

12-
- name: Setup Micromamba
13-
uses: mamba-org/provision-with-micromamba@v15
12+
- name: Setup Micromamba env
13+
uses: mamba-org/setup-micromamba@v1
1414
with:
15-
environment-file: false
15+
environment-name: TEST
16+
create-args: >-
17+
python=3
18+
--file requirements.txt
19+
--file requirements-dev.txt
1620
17-
- name: Create env
21+
- name: Install folium from source
1822
shell: bash -l {0}
1923
run: |
20-
micromamba create --name TEST python=${{ matrix.python-version }} --file requirements.txt --file requirements-dev.txt --channel conda-forge
21-
micromamba activate TEST
2224
python -m pip install -e . --no-deps --force-reinstall
2325
24-
- name: Selenium tests
26+
- name: Mypy test
2527
shell: bash -l {0}
2628
run: |
27-
micromamba activate TEST
2829
mypy folium

‎.github/workflows/test_selenium.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v3
1111

12-
- name: Setup Micromamba
13-
uses: mamba-org/provision-with-micromamba@v15
12+
- name: Setup Micromamba env
13+
uses: mamba-org/setup-micromamba@v1
1414
with:
15-
environment-file: false
15+
environment-name: TEST
16+
create-args: >-
17+
python=3
18+
--file requirements.txt
19+
--file requirements-dev.txt
1620
17-
- name: Create env
21+
- name: Install folium from source
1822
shell: bash -l {0}
19-
run: |
20-
micromamba create --name TEST python=${{ matrix.python-version }} --file requirements.txt --file requirements-dev.txt --channel conda-forge
21-
micromamba activate TEST
22-
python -m pip install -e . --no-deps --force-reinstall
23+
run: python -m pip install -e . --no-deps --force-reinstall
2324

2425
- name: Selenium tests
2526
shell: bash -l {0}
26-
run: |
27-
micromamba activate TEST
28-
python -m pytest tests/selenium -vv
27+
run: python -m pytest tests/selenium -vv

‎.github/workflows/test_style_notebooks.yml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,22 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v3
1111

12-
- name: Setup Micromamba
13-
uses: mamba-org/provision-with-micromamba@v15
12+
- name: Setup Micromamba env
13+
uses: mamba-org/setup-micromamba@v1
1414
with:
15-
environment-file: false
15+
environment-name: TEST
16+
create-args: >-
17+
python=3
18+
--file requirements.txt
19+
--file requirements-dev.txt
1620
17-
- name: Create env
21+
- name: Install folium from source
1822
shell: bash -l {0}
19-
run: |
20-
micromamba create --name TEST python=${{ matrix.python-version }} --file requirements.txt --file requirements-dev.txt --channel conda-forge
21-
micromamba activate TEST
22-
python -m pip install -e . --no-deps --force-reinstall
23+
run: python -m pip install -e . --no-deps --force-reinstall
2324

2425
- name: Notebook coding standards tests
2526
shell: bash -l {0}
26-
run: |
27-
micromamba activate TEST
28-
for fname in examples/*.ipynb; do echo $fname $(flake8-nb $fname --ignore=W391,E226,E402,W504,I100,I201,I202,E703 --max-line-length=120 --show-source --count); done
27+
run: >
28+
for fname in examples/*.ipynb;
29+
do echo $fname $(flake8-nb $fname --ignore=W391,E226,E402,W504,I100,I201,I202,E703 --max-line-length=120 --show-source --count);
30+
done

0 commit comments

Comments
 (0)