[Git][debian-gis-team/xsar][master] 6 commits: Fix package version
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Thu Aug 31 07:40:54 BST 2023
Antonio Valentino pushed to branch master at Debian GIS Project / xsar
Commits:
4bca80a7 by Antonio Valentino at 2023-08-31T06:30:07+00:00
Fix package version
- - - - -
e80ee89b by Antonio Valentino at 2023-08-31T06:33:42+00:00
New upstream version 2023.08.0.post1
- - - - -
af54006f by Antonio Valentino at 2023-08-31T06:33:48+00:00
Update upstream source from tag 'upstream/2023.08.0.post1'
Update to upstream version '2023.08.0.post1'
with Debian dir c09832d790e4814526d45c4b4e377a5866787128
- - - - -
0eddac61 by Antonio Valentino at 2023-08-31T06:34:30+00:00
New upstream release
- - - - -
290b2ecf by Antonio Valentino at 2023-08-31T06:38:58+00:00
Update dependencies
- - - - -
8b5bd9e3 by Antonio Valentino at 2023-08-31T06:40:19+00:00
Refresh all patches
- - - - -
9 changed files:
- .git_archival.txt
- .github/workflows/publish.yml
- debian/changelog
- debian/control
- debian/patches/0001-Do-not-install-scripts.patch
- 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
=====================================
debian/changelog
=====================================
@@ -1,8 +1,13 @@
-xsar (1.1.6-2ubuntu1) UNRELEASED; urgency=medium
+xsar (2023.08.0.post1-1) UNRELEASED; urgency=medium
[ Antonio Valentino ]
+ * New upstream release.
* debian/control:
- - remove Suggests from unexisting package python-xsar-doc.
+ - Remove Suggests from unexisting package python-xsar-doc.
+ - Update dependencies (remove more-itertools, requests and
+ importlib-resources).
+ * debian/patches:
+ - Refresh all patches.
[ Bas Couwenberg ]
* Switch to dh-sequence-*.
=====================================
debian/control
=====================================
@@ -16,15 +16,12 @@ Build-Depends: debhelper-compat (= 13),
python3-fiona,
python3-fsspec,
python3-geopandas,
- python3-importlib-resources,
python3-matplotlib,
- python3-more-itertools,
python3-numpy,
python3-packaging,
python3-psutil,
python3-pyproj,
python3-rasterio,
- python3-requests,
python3-scipy,
python3-setuptools,
python3-setuptools-scm,
=====================================
debian/patches/0001-Do-not-install-scripts.patch
=====================================
@@ -8,7 +8,7 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index 75089ac..707d3d2 100644
+index 710b6ea..e1c3924 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ setup(
=====================================
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/-/compare/16e35e06a3f406b160a246a81a9dd9d2178d38f2...8b5bd9e32689cd79c1577378dad77d7af5b163ce
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/xsar/-/compare/16e35e06a3f406b160a246a81a9dd9d2178d38f2...8b5bd9e32689cd79c1577378dad77d7af5b163ce
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/dec1f036/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list