Skip to content

Commit 37c3447

Browse files
authored
Merge branch 'master' into stac
2 parents 8aae5d3 + e913bbd commit 37c3447

File tree

237 files changed

+52163
-42957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+52163
-42957
lines changed

.github/workflows/codeql.yml

+49-50
Original file line numberDiff line numberDiff line change
@@ -12,63 +12,62 @@
1212
name: "CodeQL"
1313

1414
on:
15-
push:
16-
branches: [ "master" ]
17-
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [ "master" ]
20-
schedule:
21-
- cron: '15 20 * * 1'
15+
push:
16+
branches: ["master"]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: ["master"]
20+
schedule:
21+
- cron: "15 20 * * 1"
2222

2323
jobs:
24-
analyze:
25-
name: Analyze
26-
runs-on: ubuntu-latest
27-
permissions:
28-
actions: read
29-
contents: read
30-
security-events: write
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
3131

32-
strategy:
33-
fail-fast: false
34-
matrix:
35-
language: [ 'python' ]
36-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: ["python"]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
3838

39-
steps:
40-
- name: Checkout repository
41-
uses: actions/checkout@v3
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v4
4242

43-
# Initializes the CodeQL tools for scanning.
44-
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
46-
with:
47-
languages: ${{ matrix.language }}
48-
# If you wish to specify custom queries, you can do so here or in a config file.
49-
# By default, queries listed here will override any specified in a config file.
50-
# Prefix the list here with "+" to use these queries and those in the config file.
51-
52-
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
53-
# queries: security-extended,security-and-quality
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v2
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
5451

55-
56-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
57-
# If this step fails, then you should remove it and run the build manually (see below)
58-
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v2
52+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
53+
# queries: security-extended,security-and-quality
6054

61-
# ℹ️ Command-line programs to run using the OS shell.
62-
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
55+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
56+
# If this step fails, then you should remove it and run the build manually (see below)
57+
- name: Autobuild
58+
uses: github/codeql-action/autobuild@v2
6359

64-
# If the Autobuild fails above, remove it and uncomment the following three lines.
65-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
60+
# ℹ️ Command-line programs to run using the OS shell.
61+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
6662

67-
# - run: |
68-
# echo "Run, Build Application using script"
69-
# ./location_of_script_within_repo/buildscript.sh
63+
# If the Autobuild fails above, remove it and uncomment the following three lines.
64+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
7065

71-
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v2
73-
with:
74-
category: "/language:${{matrix.language}}"
66+
# - run: |
67+
# echo "Run, Build Application using script"
68+
# ./location_of_script_within_repo/buildscript.sh
69+
70+
- name: Perform CodeQL Analysis
71+
uses: github/codeql-action/analyze@v2
72+
with:
73+
category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
#
55
# Source repository: https://github.com/actions/dependency-review-action
66
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
7-
name: 'Dependency Review'
7+
name: "Dependency Review"
88
on: [pull_request]
99

1010
permissions:
11-
contents: read
11+
contents: read
1212

1313
jobs:
14-
dependency-review:
15-
runs-on: ubuntu-latest
16-
steps:
17-
- name: 'Checkout Repository'
18-
uses: actions/checkout@v3
19-
- name: 'Dependency Review'
20-
uses: actions/dependency-review-action@v2
14+
dependency-review:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: "Checkout Repository"
18+
uses: actions/checkout@v4
19+
- name: "Dependency Review"
20+
uses: actions/dependency-review-action@v2

.github/workflows/docker-image.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
name: Docker Image CI
22

33
on:
4-
push:
5-
branches: ["master"]
6-
pull_request:
7-
branches: ["master"]
4+
push:
5+
branches: ["master"]
6+
pull_request:
7+
branches: ["master"]
88

99
jobs:
10-
build:
11-
runs-on: ubuntu-latest
10+
build:
11+
runs-on: ubuntu-latest
1212

13-
steps:
14-
- uses: actions/checkout@v3
15-
- name: Build the Docker image
16-
run: docker build . --file Dockerfile --tag ${{ github.repository }}:$(date +%s)
13+
steps:
14+
- uses: actions/checkout@v4
15+
- name: Build the Docker image
16+
run: docker build . --file Dockerfile --tag ${{ github.repository }}:$(date +%s)

.github/workflows/docker-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
contents: read
1414
steps:
1515
- name: Check out the repo
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

1818
- name: Log in to Docker Hub
1919
uses: docker/login-action@v2

.github/workflows/docs-build.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: ["3.10"]
13+
python-version: ["3.11"]
1414

1515
defaults:
1616
run:
@@ -26,12 +26,13 @@ jobs:
2626
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
2727
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2828
GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
29-
29+
EARTHDATA_USERNAME: ${{ secrets.EARTHDATA_USERNAME }}
30+
EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
3031
steps:
31-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3233

3334
- name: Setup Python
34-
uses: conda-incubator/setup-miniconda@v2
35+
uses: conda-incubator/setup-miniconda@v3
3536
with:
3637
auto-activate-base: true
3738
python-version: ${{ matrix.python-version }}

.github/workflows/docs.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: ["3.10"]
11+
python-version: ["3.11"]
1212

1313
defaults:
1414
run:
@@ -24,12 +24,14 @@ jobs:
2424
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
2525
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2626
GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
27+
EARTHDATA_USERNAME: ${{ secrets.EARTHDATA_USERNAME }}
28+
EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
2729

2830
steps:
29-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3032

3133
- name: Setup Python
32-
uses: conda-incubator/setup-miniconda@v2
34+
uses: conda-incubator/setup-miniconda@v3
3335
with:
3436
auto-activate-base: true
3537
python-version: ${{ matrix.python-version }}

.github/workflows/installation.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
python-version: ["3.10"]
16+
python-version: ["3.11"]
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Set up Python
20-
uses: actions/setup-python@v4
20+
uses: actions/setup-python@v5
2121
with:
2222
python-version: ${{ matrix.python-version }}
2323
- name: Install package
2424
run: pip install .
2525
- name: Test import
2626
run: python -c "import leafmap; print('leafmap import successful')"
27+
- name: Discover typos with codespell
28+
run: |
29+
pip install codespell
30+
codespell --skip=".*,.git/*,*.csv,*.geojson,*.json,*.js,*.html,*cff,*.pdf" --ignore-words-list="aci,acount,acounts,fallow,hart,hist,nd,ned,ois,wqs"

.github/workflows/macos.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
config:
18-
- { os: macOS-latest, py: "3.10" }
18+
- { os: macOS-latest, py: "3.11" }
1919
env:
2020
SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
2121
steps:
2222
- name: CHECKOUT CODE
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
- name: SETUP PYTHON
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
2626
with:
2727
python-version: ${{ matrix.config.py }}
2828
- name: Install package

.github/workflows/pypi.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: Set up Python
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: "3.x"
2020
- name: Install dependencies

.github/workflows/ubuntu.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
3232

3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535

3636
- name: Setup Python
37-
uses: conda-incubator/setup-miniconda@v2
37+
uses: conda-incubator/setup-miniconda@v3
3838
with:
3939
auto-activate-base: true
4040
python-version: ${{ matrix.python-version }}

.github/workflows/windows.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ jobs:
1212
runs-on: windows-latest
1313
strategy:
1414
matrix:
15-
python-version: ["3.10"]
15+
python-version: ["3.11"]
1616

1717
defaults:
1818
run:
1919
shell: bash -el {0}
2020

2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323

2424
- name: Setup Python
25-
uses: conda-incubator/setup-miniconda@v2
25+
uses: conda-incubator/setup-miniconda@v3
2626
with:
2727
auto-activate-base: true
2828
python-version: ${{ matrix.python-version }}

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM jupyter/scipy-notebook:latest
2-
RUN mamba install -c conda-forge leafmap geopandas localtileserver osmnx -y && \
3-
pip install -U leafmap jsonschema==4.18.0 && \
2+
RUN mamba install -c conda-forge leafmap geopandas "localtileserver>=0.10.0" osmnx -y && \
3+
pip install -U leafmap jsonschema==4.18.0 lonboard h5py && \
44
fix-permissions "${CONDA_DIR}" && \
55
fix-permissions "/home/${NB_USER}"
66

@@ -14,4 +14,4 @@ ENV PROJ_LIB='/opt/conda/share/proj'
1414

1515
USER root
1616
RUN chown -R ${NB_UID} ${HOME}
17-
USER ${NB_USER}
17+
USER ${NB_USER}

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
[![image](https://jupyterlite.rtfd.io/en/latest/_static/badge.svg)](https://demo.leafmap.org)
44
[![image](https://studiolab.sagemaker.aws/studiolab.svg)](https://studiolab.sagemaker.aws/import/github/opengeos/leafmap/blob/master/examples/notebooks/00_key_features.ipynb)
55
[![image](https://img.shields.io/badge/Open-Planetary%20Computer-black?style=flat&logo=microsoft)](https://pccompute.westeurope.cloudapp.azure.com/compute/hub/user-redirect/git-pull?repo=https://github.com/opengeos/leafmap&urlpath=lab/tree/leafmap/examples/notebooks/00_key_features.ipynb&branch=master)
6-
[![image](https://colab.research.google.com/assets/colab-badge.svg)](https://gishub.org/leafmap-colab)
7-
[![image](https://mybinder.org/badge_logo.svg)](https://gishub.org/leafmap-binder)
6+
[![image](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/opengeos/leafmap/blob/master)
7+
[![image](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/opengeos/leafmap/HEAD)
88
[![image](https://img.shields.io/pypi/v/leafmap.svg)](https://pypi.python.org/pypi/leafmap)
99
[![image](https://img.shields.io/conda/vn/conda-forge/leafmap.svg)](https://anaconda.org/conda-forge/leafmap)
1010
[![image](https://static.pepy.tech/badge/leafmap)](https://pepy.tech/projects/leafmap)
@@ -44,8 +44,8 @@ Leafmap addresses these challenges by leveraging the bidirectional communication
4444
Launch the interactive notebook tutorial for the **leafmap** Python package with JupyterLite, Google Colab, Binder, or Amazon Sagemaker Studio Lab now:
4545

4646
[![image](https://jupyterlite.rtfd.io/en/latest/_static/badge.svg)](https://demo.leafmap.org)
47-
[![image](https://colab.research.google.com/assets/colab-badge.svg)](https://gishub.org/leafmap-colab)
48-
[![image](https://mybinder.org/badge_logo.svg)](https://gishub.org/leafmap-binder)
47+
[![image](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/opengeos/leafmap/blob/master)
48+
[![image](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/opengeos/leafmap/HEAD)
4949
[![Open In Studio Lab](https://studiolab.sagemaker.aws/studiolab.svg)](https://studiolab.sagemaker.aws/import/github/opengeos/leafmap/blob/master/examples/notebooks/00_key_features.ipynb)
5050

5151
Check out this excellent article on Medium - [Leafmap a new Python Package for Geospatial data science](https://link.medium.com/HRRKDcynYgb)

0 commit comments

Comments
 (0)