From 87d3973056aa7d4515899e3454a930e56f4ebdb4 Mon Sep 17 00:00:00 2001 From: Qiusheng Wu Date: Wed, 7 Feb 2024 14:17:34 -0500 Subject: [PATCH 1/2] Update geemap and leafmap versions --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7871949..a0bb456 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,12 +4,12 @@ ffmpeg-python gdown geeadd geedim>=1.6.1 -geemap>=0.22.1 +geemap>=0.30.4 geojson geopandas ipynb-py-convert kaleido -leafmap>=0.21.3 +leafmap>=0.31.0 localtileserver>=0.6.1 mapclassify>=2.4.0 mss From 9a628f214fd57eb299609caeb81ba814881f78ad Mon Sep 17 00:00:00 2001 From: Qiusheng Wu Date: Wed, 7 Feb 2024 14:32:38 -0500 Subject: [PATCH 2/2] Update GitHub Actions --- .github/workflows/docs.yml | 58 +++++++++++++++++------------------ .github/workflows/macos.yml | 6 ++-- .github/workflows/pypi.yml | 4 +-- .github/workflows/ubuntu.yml | 4 +-- .github/workflows/windows.yml | 4 +-- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 47ad365..f4909c7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,32 +1,32 @@ name: docs on: - push: - branches: - - master + push: + branches: + - master jobs: - deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: 3.9 - # - name: Install GDAL - # run: | - # python -m pip install --upgrade pip - # pip install --no-cache-dir Cython - # pip install --find-links=https://girder.github.io/large_image_wheels --no-cache GDAL - # - name: Test GDAL installation - # run: | - # python -c "from osgeo import gdal" - # gdalinfo --version - # - name: Install dependencies - # run: | - # pip install -r requirements.txt -r requirements_dev.txt - # pip install . - # - name: PKG-TEST - # run: | - # python -m unittest discover tests/ - - run: python -m pip install --upgrade pip - - run: pip install mkdocs-material mkdocstrings mkdocs-git-revision-date-plugin mkdocs-jupyter ipykernel mkdocstrings-crystal mkdocstrings-python-legacy - - run: mkdocs gh-deploy --force + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: 3.9 + # - name: Install GDAL + # run: | + # python -m pip install --upgrade pip + # pip install --no-cache-dir Cython + # pip install --find-links=https://girder.github.io/large_image_wheels --no-cache GDAL + # - name: Test GDAL installation + # run: | + # python -c "from osgeo import gdal" + # gdalinfo --version + # - name: Install dependencies + # run: | + # pip install -r requirements.txt -r requirements_dev.txt + # pip install . + # - name: PKG-TEST + # run: | + # python -m unittest discover tests/ + - run: python -m pip install --upgrade pip + - run: pip install mkdocs-material mkdocstrings mkdocs-git-revision-date-plugin mkdocs-jupyter ipykernel mkdocstrings-crystal mkdocstrings-python-legacy + - run: mkdocs gh-deploy --force diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 57c9d39..30f99e6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,13 +11,13 @@ jobs: test-macOS: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: recursive - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: "3.11" - name: Install GDAL run: brew install gdal - name: Set up GDAL diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 258c0ee..623f83c 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.x" - name: Install dependencies diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e92a7bb..d8b4de1 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -15,9 +15,9 @@ jobs: matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install GDAL diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 66839e9..f74ea19 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -11,9 +11,9 @@ jobs: test-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install miniconda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: auto-activate-base: true python-version: 3.9