Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
MAfarrag committed Dec 8, 2024
2 parents 36a91e6 + e840920 commit f514689
Show file tree
Hide file tree
Showing 38 changed files with 7,778 additions and 16,719 deletions.
5 changes: 0 additions & 5 deletions .flake8

This file was deleted.

34 changes: 18 additions & 16 deletions .github/workflows/conda-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,33 @@ jobs:
OS: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
mamba-version: "*"
#use-mamba: true
use-mamba: true
auto-update-conda: false
environment-file: environment.yml
auto-activate-base: false
environment-file: environment.yml
activate-environment: test
python-version: ${{ matrix.python-version }}
channels: conda-forge,defaults
channels: conda-forge
channel-priority: true
show-channel-urls: true

- name: Install dev-dependencies
run: |
pip install .[dev] --no-deps
pip install .[dev]
- name: Run tests
- name: Generate coverage report
shell: bash -el {0}
run: |
conda info
conda list
conda config --show-sources
conda config --show
pytest -sv -m "not plot" --ignore=tests/dataset/test_plot.py
pip install .
pytest -sv -m "not plot"
Optional-packages:
runs-on: ${{ matrix.os }}
Expand All @@ -50,37 +51,38 @@ jobs:
OS: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
mamba-version: "*"
#use-mamba: true
use-mamba: true
auto-update-conda: false
environment-file: environment-optional-packages.yml
auto-activate-base: false
environment-file: environment-optional-packages.yml
activate-environment: test
python-version: ${{ matrix.python-version }}
channels: conda-forge,defaults
channels: conda-forge
channel-priority: true
show-channel-urls: true

- name: Install dev-dependencies
run: |
pip install .[dev] --no-deps
pip install .[dev]
- name: Run tests
- name: Generate coverage report
shell: bash -el {0}
run: |
conda activate test
conda info
conda list
conda config --show-sources
conda config --show
pip install .
pytest -sv
- name: test Jupyter notebook
shell: bash -el {0}
run: |
conda activate test
pip install -e .
pip install .
pytest --nbval -k ".ipynb"
15 changes: 8 additions & 7 deletions .github/workflows/pypi-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
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==3.9.0
pip install --find-links=https://girder.github.io/large_image_wheels --no-cache GDAL==3.10.0
- name: Test GDAL installation
run: |
Expand All @@ -35,9 +35,9 @@ jobs:
run: |
pip install .[dev]
- name: Run tests
- name: Generate coverage report
run: |
pytest -sv -m "not plot" --ignore=tests/dataset/test_plot.py
python -m pytest -sv -m "not plot"
- name: Upload coverage reports to Codecov with GitHub Action
uses: codecov/codecov-action@v3
Expand All @@ -61,9 +61,9 @@ jobs:

- name: Install GDAL
run: |
pip install --upgrade pip
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==3.9.0
pip install --find-links=https://girder.github.io/large_image_wheels --no-cache GDAL==3.10.0
- name: Test GDAL installation
run: |
Expand All @@ -74,9 +74,10 @@ jobs:
run: |
pip install .[dev,viz]
- name: Run tests and generate coverage report
- name: Run Tests
run: |
pytest -v --cov=pyramids --cov-report=xml
python -m pytest -v --cov=pyramids --cov-report=xml
- name: Upload coverage reports to Codecov with GitHub Action
uses: codecov/codecov-action@v3

3 changes: 2 additions & 1 deletion .github/workflows/pypi-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ jobs:
TWINE_USERNAME: ${{ secrets.PYPI_USERS }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
pip install build
python -m build
twine upload dist/*
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
fail_fast: true
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: end-of-file-fixer
name: "[py - check] validate yaml"
Expand Down Expand Up @@ -58,19 +58,19 @@ repos:
files: ^pyramids/

- repo: https://github.com/pycqa/flake8
rev: 7.1.0
rev: 7.1.1
hooks:
- id: flake8
additional_dependencies: [Flake8-pyproject]
name: "[py - check] flake8"
# language_version: python3.9
exclude: ^(examples/|tests/)

#- repo: https://github.com/psf/black
# rev: 22.8.0
# hooks:
# - id: black
- repo: https://github.com/ambv/black
rev: 24.4.2
rev: 24.10.0
hooks:
- id: black
name: "[py - format] black"
Expand Down
14 changes: 14 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -229,3 +229,17 @@ Deprecated
*Cropping a raster using a polygon is done now directly using gdal.wrap nand the the `_crop_with_polygon_by_rasterizing`
is deprecated.
* rename the interpolation method `nearest neighbour` to `nearest neighbor`.
0.7.1 (2024-12-07)
------------------
* update `cleopatra` package version to 0.5.1 and update the api to use the new version.
* update the miniconda workflow in ci.
* update gdal to 3.10 and update the DataSource to Dataset in the `FeatureCollection.file_name`.
* add `libgdal-netcdf` and `libgdal-hdf4` to the conda dependencies.

0.7.2 (2024-12-**)
------------------
Dev
"""
* replace the setup.py with pyproject.toml
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Installing pyramids
Installing `pyramids` from the `conda-forge` channel can be achieved by:

```
conda install -c conda-forge pyramids=0.7.0
conda install -c conda-forge pyramids=0.7.1
```

It is possible to list all the versions of `pyramids` available on your platform with:
Expand All @@ -68,7 +68,7 @@ pip install git+https://github.com/Serapieum-of-alex/pyramids
to install the last release, you can easily use pip

```
pip install pyramids-gis==0.7.0
pip install pyramids-gis==0.7.1
```

Quick start
Expand Down
Loading

0 comments on commit f514689

Please sign in to comment.