[Git][debian-gis-team/xsar][upstream] New upstream version 2023.08.0.post1

[Antonio Valentino (@antonio.valentino)]

Antonio Valentino pushed to branch upstream at Debian GIS Project / xsar


Commits:
e80ee89b by Antonio Valentino at 2023-08-31T06:33:42+00:00
New upstream version 2023.08.0.post1
- - - - -


6 changed files:

- .git_archival.txt
- .github/workflows/publish.yml
- setup.py
- src/xsar/sentinel1_meta.py
- src/xsar/utils.py
- src/xsar/xsar.py


Changes:

=====================================
.git_archival.txt
=====================================
@@ -1 +1 @@
-ref-names: HEAD -> develop, tag: v1.1.6
\ No newline at end of file
+ref-names: HEAD -> develop, tag: 2023.08.0.post1
\ No newline at end of file


=====================================
.github/workflows/publish.yml
=====================================
@@ -1,32 +1,54 @@
-name: Upload package to PyPI
+name: Upload Package to PyPI
 
 on:
   release:
     types: [created]
 
 jobs:
-  publish:
-    name: Publish to PyPI
+  build:
+    name: Build packages
     runs-on: ubuntu-latest
+    if: github.repository == 'umr-lops/xsar'
     steps:
-      - uses: actions/checkout at v3
+      - name: Checkout
+        uses: actions/checkout at v3
       - name: Set up Python
         uses: actions/setup-python at v4
         with:
-          python-version: '3.x'
+          python-version: "3.x"
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip build twine
+          python -m pip install --upgrade pip
+          python -m pip install build twine
       - name: Build
         run: |
-          python -m build --sdist --wheel .
+          python -m build --sdist --outdir dist/ .
       - name: Check the built archives
         run: |
           twine check dist/*
-          pip install dist/*.whl
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish at release/v1
+      - name: Upload build artifacts
+        uses: actions/upload-artifact at v3
         with:
-          password: ${{ secrets.pypi_token }}
-          repository_url: https://upload.pypi.org/legacy/
-          verify_metadata: true
\ No newline at end of file
+          name: packages
+          path: dist/*
+
+  pypi-publish:
+    name: Upload to PyPI
+    runs-on: ubuntu-latest
+    needs: build
+
+    environment:
+      name: pypi
+      url: https://pypi.org/p/xsar
+    permissions:
+      id-token: write
+
+    steps:
+      - name: Download build artifacts
+        uses: actions/download-artifact at v3
+        with:
+          name: packages
+          path: dist/
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish at b7f401de30cb6434a1e19f805ff006643653240e


=====================================
setup.py
=====================================
@@ -13,28 +13,24 @@ setup(
     install_requires=[
         'GDAL',
         'dask[array]',
-        'dask[distributed]',
+        'distributed',
         'xarray',
         'affine',
         'rasterio',
         'cartopy',
         'fiona',
         'pyproj',
-        'jinja2<=3.0.3',
         'xarray-datatree>=0.0.9',
         'numpy',
         'scipy',
         'shapely',
         'geopandas',
-        'more_itertools',
-        'pyyaml',
         'fsspec',
         'aiohttp',
         'pytz',
         'psutil',
-        'requests',
-        'importlib-resources',
-        'xarray-safe-s1',
+        'jinja2',
+        'rioxarray'
     ],
     extras_require={
         "RS2": ["xradarsat2"],


=====================================
src/xsar/sentinel1_meta.py
=====================================
@@ -15,7 +15,7 @@ from .base_meta import BaseMeta
 from .utils import haversine, timing
 import os
 from .ipython_backends import repr_mimebundle
-from safe_s1.metadata import Sentinel1Reader
+
 
 logger = logging.getLogger('xsar.sentinel1_meta')
 logger.addHandler(logging.NullHandler())
@@ -41,7 +41,7 @@ class Sentinel1Meta(BaseMeta):
 
     @timing
     def __init__(self, name):
-
+        from safe_s1.metadata import Sentinel1Reader
         self.reader = Sentinel1Reader(name)
 
         if not name.startswith('SENTINEL1_DS:'):


=====================================
src/xsar/utils.py
=====================================
@@ -18,7 +18,7 @@ import datetime
 import string
 import pytz
 import yaml
-from importlib_resources import files
+from importlib.resources import files
 from pathlib import Path
 import fsspec
 import aiohttp


=====================================
src/xsar/xsar.py
=====================================
@@ -5,10 +5,7 @@ TODO: this docstring is the main xsar module documentation shown to the user. It
 import warnings
 import xarray
 
-try:
-    from importlib import metadata
-except ImportError: # for Python<3.8
-    import importlib_metadata as metadata
+from importlib import metadata
 __version__ = metadata.version('xsar')
 
 import logging



View it on GitLab: https://salsa.debian.org/debian-gis-team/xsar/-/commit/e80ee89bac57086415b24cb0868122dfb0c62b3c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/xsar/-/commit/e80ee89bac57086415b24cb0868122dfb0c62b3c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20230831/8bb932ac/attachment-0001.htm>