From 0adc51c4dc050946611124a159fc5c103f150a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Fri, 20 Sep 2024 09:45:47 +0200 Subject: [PATCH] General maintenance (#748) --- .github/workflows/build.yaml | 10 +++++----- .github/workflows/docs.yaml | 6 +++--- .github/workflows/nightly_lock.yaml | 2 +- .github/workflows/test.yaml | 8 ++++---- .pre-commit-config.yaml | 2 +- geoviews/util.py | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index aed6a93d..b7c0351a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ on: defaults: run: - shell: bash -el {0} + shell: bash -l {0} env: PACKAGE: "geoviews" @@ -35,14 +35,14 @@ jobs: name: Pixi lock runs-on: ubuntu-latest steps: - - uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_lock@v0 conda_build: name: Build Conda needs: [pixi_lock] runs-on: "ubuntu-latest" steps: - - uses: holoviz-dev/holoviz_tasks/pixi_install@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_install@v0 with: environments: "build" install: false @@ -93,7 +93,7 @@ jobs: needs: [pixi_lock] runs-on: "ubuntu-latest" steps: - - uses: holoviz-dev/holoviz_tasks/pixi_install@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_install@v0 with: environments: "build" install: false @@ -146,7 +146,7 @@ jobs: needs: [pixi_lock] runs-on: "ubuntu-latest" steps: - - uses: holoviz-dev/holoviz_tasks/pixi_install@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_install@v0 with: environments: "build" download-data: false diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index c0f28fb2..854dfa45 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -23,7 +23,7 @@ on: defaults: run: - shell: bash -el {0} + shell: bash -l {0} env: DISPLAY: ":99.0" @@ -33,7 +33,7 @@ jobs: name: Pixi lock runs-on: ubuntu-latest steps: - - uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_lock@v0 docs_build: name: Build Documentation @@ -43,7 +43,7 @@ jobs: outputs: tag: ${{ steps.vars.outputs.tag }} steps: - - uses: holoviz-dev/holoviz_tasks/pixi_install@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_install@v0 with: environments: docs - name: Build documentation diff --git a/.github/workflows/nightly_lock.yaml b/.github/workflows/nightly_lock.yaml index 72c96929..a449254a 100644 --- a/.github/workflows/nightly_lock.yaml +++ b/.github/workflows/nightly_lock.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 5 steps: - - uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_lock@v0 - name: Upload lock-file to S3 if: '!github.event.pull_request.head.repo.fork' env: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b07d0b83..a9ee5b8a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -30,7 +30,7 @@ concurrency: defaults: run: - shell: bash -el {0} + shell: bash -l {0} env: DISPLAY: ":99.0" @@ -107,7 +107,7 @@ jobs: name: Pixi lock runs-on: ubuntu-latest steps: - - uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_lock@v0 with: cache: ${{ github.event.inputs.cache == 'true' || github.event.inputs.cache == '' }} @@ -120,7 +120,7 @@ jobs: matrix: ${{ fromJson(needs.setup.outputs.matrix) }} timeout-minutes: 120 steps: - - uses: holoviz-dev/holoviz_tasks/pixi_install@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_install@v0 if: needs.setup.outputs.code_change == 'true' with: environments: ${{ matrix.environment }} @@ -148,7 +148,7 @@ jobs: environment: ["test-core"] timeout-minutes: 120 steps: - - uses: holoviz-dev/holoviz_tasks/pixi_install@pixi + - uses: holoviz-dev/holoviz_tasks/pixi_install@v0 if: needs.setup.outputs.code_change == 'true' with: environments: ${{ matrix.environment }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3a7d4fdc..886e1598 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,7 +20,7 @@ repos: - id: check-json - id: detect-private-key - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.9 + rev: v0.6.6 hooks: - id: ruff files: geoviews/ diff --git a/geoviews/util.py b/geoviews/util.py index d745cd4c..d99ede9f 100644 --- a/geoviews/util.py +++ b/geoviews/util.py @@ -64,8 +64,8 @@ def project_extents(extents, src_proj, dest_proj, tol=1e-6): # Limit latitudes cy1, cy2 = src_proj.y_limits - if y1 < cy1: y1 = cy1 - if y2 > cy2: y2 = cy2 + y1 = max(y1, cy1) + y2 = min(y2, cy2) # Offset with tolerances x1 += tol @@ -79,8 +79,8 @@ def project_extents(extents, src_proj, dest_proj, tol=1e-6): lons = wrap_lons(np.linspace(x1, x2, 10000), -180., 360.) x1, x2 = lons.min(), lons.max() else: - if x1 < cx1: x1 = cx1 - if x2 > cx2: x2 = cx2 + x1 = max(x1, cx1) + x2 = min(x2, cx2) domain_in_src_proj = Polygon([[x1, y1], [x2, y1], [x2, y2], [x1, y2],