Skip to content

Commit

Permalink
Merge branch 'develop' into esa-worldcover-test
Browse files Browse the repository at this point in the history
  • Loading branch information
alexgleith authored Dec 18, 2023
2 parents 31a260c + fc06a1c commit 908accc
Show file tree
Hide file tree
Showing 58 changed files with 317 additions and 6,176 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v1
with:
python-version: 3.8
python-version: 3.9

- uses: actions/cache@v3
id: wheels_cache
Expand Down Expand Up @@ -75,8 +75,7 @@ jobs:
with:
path: |
tests/env
key: ${{ runner.os }}-test-env-py38-${{ hashFiles('tests/test-env-py38.yml') }}
key: ${{ runner.os }}-test-env-${{ hashFiles('tests/test-env.yml') }}

- uses: conda-incubator/setup-miniconda@v2
if: steps.conda_cache.outputs.cache-hit != 'true'
Expand All @@ -103,7 +102,7 @@ jobs:
shell: bash -l {0}
if: steps.conda_cache.outputs.cache-hit != 'true'
run: |
mamba env create -f tests/test-env-py38.yml -p tests/env
mamba env create -f tests/test-env.yml -p tests/env
- name: Check Python Env
shell: bash -l {0}
Expand All @@ -127,8 +126,7 @@ jobs:
with:
path: |
tests/env
key: ${{ runner.os }}-test-env-py38-${{ hashFiles('tests/test-env-py38.yml') }}
key: ${{ runner.os }}-test-env-${{ hashFiles('tests/test-env.yml') }}

- name: Update PATH
shell: bash
Expand Down Expand Up @@ -210,8 +208,7 @@ jobs:
with:
path: |
tests/env
key: ${{ runner.os }}-test-env-py38-${{ hashFiles('tests/test-env-py38.yml') }}
key: ${{ runner.os }}-test-env-${{ hashFiles('tests/test-env.yml') }}

- name: Update PATH
shell: bash
Expand Down Expand Up @@ -265,7 +262,6 @@ jobs:
strategy:
matrix:
pkg:
- odc-algo
- odc-cloud
- odc-io
- odc-ui
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ coverage.xml
# Sphinx documentation
docs/_build/

# VIM swap files
.*.sw?

# PyBuilder
target/
.idea/
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
repos:
- repo: https://github.com/adrienverge/yamllint
rev: v1.32.0
rev: v1.33.0
hooks:
- id: yamllint
args: ['-c', '.yamllint']
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: end-of-file-fixer
- id: check-docstring-first
Expand All @@ -26,14 +26,14 @@ repos:
# name: isort (python)
# args: [ "--profile", "black", "--filter-files" ]
- repo: https://github.com/psf/black
rev: 23.7.0
rev: 23.11.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-pylint
rev: 'v3.0.0a5' # Use the sha / tag you want to point at
hooks:
- id: pylint
- repo: https://github.com/PyCQA/flake8
rev: '6.0.0'
rev: '6.1.0'
hooks:
- id: flake8
Loading

0 comments on commit 908accc

Please sign in to comment.