[Git][debian-gis-team/pyaps3][master] 5 commits: New upstream version 0.3.3
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Sun Jun 23 07:02:23 BST 2024
Antonio Valentino pushed to branch master at Debian GIS Project / pyaps3
Commits:
12ddae56 by Antonio Valentino at 2024-06-23T05:54:25+00:00
New upstream version 0.3.3
- - - - -
ccdae372 by Antonio Valentino at 2024-06-23T05:54:50+00:00
Update upstream source from tag 'upstream/0.3.3'
Update to upstream version '0.3.3'
with Debian dir 5b2a0453e90104a8b4f0e092cdd71754be292e82
- - - - -
d865ae76 by Antonio Valentino at 2024-06-23T05:55:26+00:00
New upstream release
- - - - -
ad44f37a by Antonio Valentino at 2024-06-23T05:56:16+00:00
Update dates in d/copyright
- - - - -
537f24d8 by Antonio Valentino at 2024-06-23T05:57:20+00:00
Set distribution to unstable
- - - - -
8 changed files:
- .circleci/config.yml
- + .github/release.yml
- .github/workflows/build-n-publish-to-pypi.yml
- README.md
- debian/changelog
- debian/copyright
- pyproject.toml
- src/pyaps3/autoget.py
Changes:
=====================================
.circleci/config.yml
=====================================
@@ -25,26 +25,25 @@ jobs:
docker:
- image: ubuntu:bionic
environment:
- CONDA_PREFIX: /root/tools/miniconda3
+ CONDA_PREFIX: /root/tools/miniforge
+ PYAPS_HOME: /root/tools/PyAPS
user: root
working_directory: /root/tools/PyAPS
# Checkout the code as the first step. This is a dedicated CircleCI step.
steps:
- checkout
- run:
- name: Setting Environment with Miniconda
+ name: Setting Environment with Miniforge
command: |
apt update
apt-get update --yes && apt-get upgrade --yes
apt-get install --yes git wget
- # download and install miniconda3
+ # download and install miniforge
mkdir -p ${HOME}/tools
cd ${HOME}/tools
- wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
- bash Miniconda3-latest-Linux-x86_64.sh -b -p ${HOME}/tools/miniconda3
- ${HOME}/tools/miniconda3/bin/conda init bash
- ${HOME}/tools/miniconda3/bin/conda config --add channels conda-forge
- ${HOME}/tools/miniconda3/bin/conda install -c conda-forge --yes mamba
+ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh
+ bash Miniforge3-Linux-x86_64.sh -b -p ${HOME}/tools/miniforge
+ ${HOME}/tools/miniforge/bin/mamba init bash
# modify/export env var PATH to BASH_ENV to be shared across run steps
echo 'export PATH=${CONDA_PREFIX}/bin:${PATH}' >> ${BASH_ENV}
@@ -53,13 +52,12 @@ jobs:
no_output_timeout: 10m
command: |
export PYTHONUNBUFFERED=1
- # install dependencies
+ # install dependencies and source code
source activate root
- mamba install --verbose --yes --file ${HOME}/tools/PyAPS/requirements.txt
- python -m pip install ${HOME}/tools/PyAPS
+ mamba install --verbose --yes --file ${PYAPS_HOME}/requirements.txt
+ python -m pip install ${PYAPS_HOME}
- run:
name: Test the Installation
command: |
- python ${HOME}/tools/PyAPS/tests/test_calc.py
-
+ python ${PYAPS_HOME}/tests/test_calc.py
=====================================
.github/release.yml
=====================================
@@ -0,0 +1,7 @@
+# .github/release.yml
+
+changelog:
+ exclude:
+ authors:
+ - dependabot
+ - pre-commit-ci
=====================================
.github/workflows/build-n-publish-to-pypi.yml
=====================================
@@ -16,12 +16,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout at v3
+ - uses: actions/checkout at v4
with:
fetch-depth: 0
- name: Set up Python 3.10
- uses: actions/setup-python at v4
+ uses: actions/setup-python at v5
with:
python-version: "3.10"
@@ -41,7 +41,7 @@ jobs:
--outdir dist/
.
- - uses: actions/upload-artifact at v3
+ - uses: actions/upload-artifact at v4
with:
path: |
dist/*.tar.gz
@@ -54,7 +54,7 @@ jobs:
if: github.repository_owner == 'insarlab' && github.event_name == 'push'
steps:
- - uses: actions/download-artifact at v3
+ - uses: actions/download-artifact at v4
with:
# unpacks default artifact into dist/
# if `name: artifact` is omitted, the action will create extra parent dir
=====================================
README.md
=====================================
@@ -1,8 +1,9 @@
-[](https://www.python.org/)
-[](https://circleci.com/gh/insarlab/PyAPS)
-[](https://github.com/insarlab/PyAPS/releases)
-[](https://github.com/insarlab/PyAPS/blob/main/LICENSE)
-[](https://doi.org/10.1029/2011GL048757)
+[](https://www.python.org/)
+[](https://circleci.com/gh/insarlab/PyAPS)
+[](https://anaconda.org/conda-forge/pyaps3)
+[](https://github.com/insarlab/PyAPS/releases)
+[](https://github.com/insarlab/PyAPS/blob/main/LICENSE)
+[](https://doi.org/10.1029/2011GL048757)
## PyAPS - Python based Atmospheric Phase Screen estimation
@@ -61,14 +62,14 @@ python PyAPS/tests/test_calc.py
ERA5 data set is redistributed over the Copernicus Climate Data Store (CDS). Registration is required for the data access and downloading.
+ [Create a new account](https://cds.climate.copernicus.eu/user/register) on the CDS website if you don't own a user account yet.
-+ Create local key file. Create a file named `.cdsapirc` in your home directory and add the following two lines:
++ Create the local file `$HOME/.cdsapirc` and add the following two lines:
```shell
url: https://cds.climate.copernicus.eu/api/v2
key: 12345:abcdefghij-134-abcdefgadf-82391b9d3f
```
-where 12345 is your personal user ID (UID), the part behind the colon is your personal API key. More details can be found [here](https://cds.climate.copernicus.eu/api-how-to).
+where 12345 is your personal user ID (UID), the part behind the colon is your personal API key. More details can be found [here](https://cds.climate.copernicus.eu/api-how-to). Alternatively, you could edit the `model.cfg` file in the package directory, `site-packages/pyaps3` if installed via conda, and fill in the `[CDS]` section.
+ **Make sure** that you accept the data license in the Terms of use on ECMWF website.
@@ -83,4 +84,4 @@ python PyAPS/tests/test_dload.py
The methodology and validation can be found in:
-+ Jolivet, R., R. Grandin, C. Lasserre, M.-P. Doin and G. Peltzer (2011), Systematic InSAR tropospheric phase delay corrections from global meteorological reanalysis data, _Geophys. Res. Lett., 38,_ L17311, doi:10.1029/2011GL048757.
++ Jolivet, R., R. Grandin, C. Lasserre, M.-P. Doin and G. Peltzer (2011), Systematic InSAR tropospheric phase delay corrections from global meteorological reanalysis data, _Geophys. Res. Lett., 38,_ L17311, doi:[10.1029/2011GL048757](https://doi.org/10.1029/2011GL048757).
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+pyaps3 (0.3.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update dates in d/copyright.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Sun, 23 Jun 2024 05:57:06 +0000
+
pyaps3 (0.3.2-2) unstable; urgency=medium
[ Bas Couwenberg ]
=====================================
debian/copyright
=====================================
@@ -13,7 +13,7 @@ Copyright: 2012-2013, ECMWF.
License: Apache-2.0
Files: debian/*
-Copyright: 2022, Antonio Valentino <antonio.valentino at tiscali.it>
+Copyright: 2022-2024, Antonio Valentino <antonio.valentino at tiscali.it>
License: GPL-3+
License: Apache-2.0
=====================================
pyproject.toml
=====================================
@@ -45,7 +45,7 @@ zip-safe = false
where = ["src"]
[tool.setuptools.package-data]
-pysolid = ["*.cfg"]
+pyaps3 = ["*.cfg"]
[tool.setuptools_scm]
version_scheme = "post-release"
=====================================
src/pyaps3/autoget.py
=====================================
@@ -136,7 +136,7 @@ def ECMWFdload(bdate,hr,filedir,model='ERA5',datatype='fc',humidity='Q',snwe=Non
# CASE 2: request for WEB API client (old ECMWF platform, deprecated, for ERA-Int and HRES)
else:
# Contact the server
- from pa.ecmwfapi import ECMWFDataServer
+ from pyaps3.ecmwfapi import ECMWFDataServer
url = "https://api.ecmwf.int/v1"
emid = config.get('ECMWF', 'email')
key = config.get('ECMWF', 'key')
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyaps3/-/compare/df9e3a51cd18ba2cef44e1d0190c087deb1a5757...537f24d82fdcbef350a3aea46660ac5cad31b698
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyaps3/-/compare/df9e3a51cd18ba2cef44e1d0190c087deb1a5757...537f24d82fdcbef350a3aea46660ac5cad31b698
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/20240623/46495d15/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list