Skip to content

Commit

Permalink
fix the issue in cleopatra version (#104)
Browse files Browse the repository at this point in the history
* fix the issue in cleopatra version

* update miniconda workflow action

* activate use mamba

* update notebooks

* update dependencies

* reduce loguru version to match pypi and conda-forge

* update the name attribute in the ogr.DataSource

* update gdal in the workflow

* add libgdal-netcdf, libgdal-hdf4 to the conda dependencies

* update notebook

* ogr.Open now returns a Dataset not DataSource

* update check list files

* update gdal in readthedocs
  • Loading branch information
MAfarrag authored Dec 7, 2024
1 parent ff5f8d5 commit 58368a7
Show file tree
Hide file tree
Showing 21 changed files with 6,732 additions and 6,454 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/conda-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ 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
Expand Down Expand Up @@ -50,14 +50,14 @@ 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
Expand Down
4 changes: 2 additions & 2 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 Down Expand Up @@ -64,7 +64,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 Down
7 changes: 7 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -229,3 +229,10 @@ 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.
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
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- numpy >=2.0.0
- numpydoc==1.1.0
- typing-extensions==3.10.*
- gdal==3.9.0
- gdal==3.10.0
- pip:
- pydata_sphinx_theme>=0.15.2
- sphinxcontrib-napoleon
Expand Down
4 changes: 2 additions & 2 deletions docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ dependencies
Required dependencies
=====================

- Python (3.9 or later)
- Python (3.11 or later)
- `numpy <https://www.numpy.org/>`__ (1.21 or later)
- `GDAL <https://gdal.org/>`__ (3.6.2 or later)
- `GDAL <https://gdal.org/>`__ (3.9.0 or later)
- `pandas <https://pandas.pydata.org/>`__ (2 or later)
- `geopandas <https://geopandas.org/>`__ (0.12.2 or later)
- `Shapely <https://shapely.readthedocs.io/>`__ (1.8.4 or later)
Expand Down
24 changes: 13 additions & 11 deletions environment-optional-packages.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
channels:
- conda-forge
dependencies:
- numpy >=2.0.0
- numpy >=2.1.3
- hpc >=0.1.4
- pip >=24.0.0
- gdal ==3.9.0
- pandas >=2.1.0
- geopandas >=0.14.1
- Shapely >=2.0.2
- pyproj >=3.6.1
- cleopatra >=0.4.2
- PyYAML >=6.0.1
- pip >=24.3.1
- gdal ==3.10.0
- libgdal-netcdf ==3.10.0
- libgdal-hdf4 ==3.10.0
- pandas >=2.2.3
- geopandas >=1.0.1
- Shapely >=2.0.6
- pyproj >=3.7.0
- cleopatra >=0.5.1
- PyYAML >=6.0.2
- loguru >=0.7.2
- pytest >=8.2.2
- pytest-cov >=5.0.0
- pytest >=8.3.4
- pytest-cov >=6.0.0
- nbval >=0.11.0
22 changes: 12 additions & 10 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
channels:
- conda-forge
dependencies:
- numpy >=2.0.0
- numpy >=2.1.3
- hpc >=0.1.4
- pip >=24.0.0
- gdal ==3.9.0
- pandas >=2.1.0
- geopandas >=0.14.1
- Shapely >=2.0.2
- pyproj >=3.6.1
- PyYAML >=6.0.1
- pip >=24.3.1
- gdal ==3.10.0
- libgdal-netcdf ==3.10.0
- libgdal-hdf4 ==3.10.0
- pandas >=2.2.3
- geopandas >=1.0.1
- Shapely >=2.0.6
- pyproj >=3.7.0
- PyYAML >=6.0.2
- loguru >=0.7.2
- pytest >=8.2.2
- pytest-cov >=5.0.0
- pytest >=8.3.4
- pytest-cov >=6.0.0
- nbval >=0.11.0
911 changes: 571 additions & 340 deletions examples/notebooks/02spatial-operation-methods.ipynb

Large diffs are not rendered by default.

580 changes: 290 additions & 290 deletions examples/notebooks/03convert-longitude.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit 58368a7

Please sign in to comment.