[Git][debian-gis-team/pygac][master] 8 commits: New upstream version 1.6.0
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Mon Aug 8 08:13:12 BST 2022
Antonio Valentino pushed to branch master at Debian GIS Project / pygac
Commits:
cc570d7f by Antonio Valentino at 2022-08-08T06:24:48+00:00
New upstream version 1.6.0
- - - - -
3905fb5c by Antonio Valentino at 2022-08-08T06:24:50+00:00
Update upstream source from tag 'upstream/1.6.0'
Update to upstream version '1.6.0'
with Debian dir 568f38b46517aa290ef933d35246d9a6588eb853
- - - - -
effc8cd8 by Antonio Valentino at 2022-08-08T06:27:00+00:00
New upstream release
- - - - -
5c9b9322 by Antonio Valentino at 2022-08-08T06:33:03+00:00
Use pybuild-plugin-pyproject
- - - - -
0175b2ad by Antonio Valentino at 2022-08-08T06:34:27+00:00
Update lintian overrides
- - - - -
e5045050 by Antonio Valentino at 2022-08-08T06:54:22+00:00
Switch to setuptools-scm
- - - - -
8e5ff83b by Antonio Valentino at 2022-08-08T07:05:10+00:00
Fix installation paths
- - - - -
e109af13 by Antonio Valentino at 2022-08-08T07:07:10+00:00
Set distribution to unstable
- - - - -
15 changed files:
- + .readthedocs.yml
- CHANGELOG.md
- README.md
- debian/changelog
- debian/control
- − debian/patches/0002-Do-not-use-setuptools_scm.patch
- debian/patches/series
- debian/python3-pygac.install
- debian/python3-pygac.lintian-overrides
- debian/rules
- + doc/rtd_environment.yaml
- + doc/source/_static/.gitkeep
- doc/source/introduction.rst
- pygac/calibration.py
- pygac/data/calibration.json
Changes:
=====================================
.readthedocs.yml
=====================================
@@ -0,0 +1,14 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+version: 2
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+ configuration: doc/source/conf.py
+ fail_on_warning: true
+
+build:
+ os: "ubuntu-20.04"
+ tools:
+ python: "mambaforge-4.10"
+conda:
+ environment: doc/rtd_environment.yaml
=====================================
CHANGELOG.md
=====================================
@@ -1,3 +1,26 @@
+## Version <1.6.0> (2022/08/04)
+
+### Issues Closed
+
+* [Issue 107](https://github.com/pytroll/pygac/issues/107) - Fix sun-earth distance correction
+* [Issue 104](https://github.com/pytroll/pygac/issues/104) - Links to POD/KLM user guides are mixed up ([PR 105](https://github.com/pytroll/pygac/pull/105) by [@mraspaud](https://github.com/mraspaud))
+* [Issue 103](https://github.com/pytroll/pygac/issues/103) - API is missing on readthedocs
+* [Issue 40](https://github.com/pytroll/pygac/issues/40) - Calculated sun-earth distance correction factor once and add as attribute
+
+In this release 4 issues were closed.
+
+### Pull Requests Merged
+
+#### Features added
+
+* [PR 109](https://github.com/pytroll/pygac/pull/109) - Add new unpublished METOPC VIS calibration coefficients from Patmos-x
+
+#### Documentation changes
+
+* [PR 105](https://github.com/pytroll/pygac/pull/105) - Fix the pod and klm guide links ([104](https://github.com/pytroll/pygac/issues/104))
+
+In this release 2 pull requests were closed.
+
## Version 1.5.0 (2022/01/10)
### Issues Closed
=====================================
README.md
=====================================
@@ -3,6 +3,7 @@ pygac
[](https://github.com/pytroll/pygac/actions/workflows/ci.yaml)
[](https://codecov.io/gh/pytroll/pygac)
+[](https://doi.org/10.5281/zenodo.5832775)
Pygac is a Python package to read, calibrate and navigate data from the AVHRR
=====================================
debian/changelog
=====================================
@@ -1,10 +1,23 @@
-pygac (1.5.0-2) UNRELEASED; urgency=medium
+pygac (1.6.0-1) unstable; urgency=medium
- * Team upload.
+ [ Bas Couwenberg ]
* Bump Standards-Version to 4.6.1, no changes.
* Use supported python3 versions in autopkgtest.
- -- Bas Couwenberg <sebastic at debian.org> Tue, 21 Jun 2022 07:18:19 +0200
+ [ Antonio Valentino ]
+ * New upstream release.
+ * debian/control:
+ - add pybuild-plugin-pyproject to build-dependencies
+ - add build-dependency on python3-setuptools-scm.
+ * Update lintian overrides.
+ * debian/patches:
+ - drop 0002-Do-not-use-setuptools_scm.patch.
+ * debian/rules:
+ - use the SETUPTOOLS_SCM_PRETEND_VERSION environment variable
+ to set the proper package version.
+ * Fix paths in d/python3-pygac.install.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Mon, 08 Aug 2022 07:06:55 +0000
pygac (1.5.0-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -7,6 +7,7 @@ Rules-Requires-Root: no
Priority: optional
Build-Depends: debhelper-compat (= 12),
dh-python,
+ pybuild-plugin-pyproject,
python3-all,
python3-bottleneck,
python3-docutils,
@@ -16,7 +17,8 @@ Build-Depends: debhelper-compat (= 12),
python3-pyorbital,
python3-pytest,
python3-scipy,
- python3-setuptools
+ python3-setuptools,
+ python3-setuptools-scm
Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/debian-gis-team/pygac
Vcs-Git: https://salsa.debian.org/debian-gis-team/pygac.git
=====================================
debian/patches/0002-Do-not-use-setuptools_scm.patch deleted
=====================================
@@ -1,38 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 15 Jan 2022 09:04:55 +0000
-Subject: Do not use setuptools_scm
-
-Forwarded: not-needed
----
- pyproject.toml | 3 ++-
- setup.cfg | 8 ++++----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index db45455..f67ff63 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,5 +1,6 @@
- [build-system]
--requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2", 'setuptools_scm_git_archive']
-+# requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2", 'setuptools_scm_git_archive']
-+requires = ["setuptools>=45", "wheel"]
- build-backend = "setuptools.build_meta"
-
- [tool.setuptools_scm]
-diff --git a/setup.cfg b/setup.cfg
-index 08ddc58..b0950b9 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,7 +1,7 @@
--[options]
--setup_requires =
-- setuptools_scm
-- setuptools_scm_git_archive
-+# [options]
-+# setup_requires =
-+# setuptools_scm
-+# setuptools_scm_git_archive
-
- [flake8]
- max-line-length = 120
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
0001-Fix-config.patch
-0002-Do-not-use-setuptools_scm.patch
0003-Install-the-tests-sub-package.patch
=====================================
debian/python3-pygac.install
=====================================
@@ -1,3 +1,3 @@
usr/lib/python3*/dist-packages/pygac*
-usr/share/pygac/*
+usr/lib/python3*/dist-packages/share/pygac/* usr/share/pygac
debian/pygac.cfg etc
=====================================
debian/python3-pygac.lintian-overrides
=====================================
@@ -1,2 +1,2 @@
# TLE files are support data files, not documentation
-package-contains-documentation-outside-usr-share-doc usr/share/pygac/gapfilled_tles/TLE_noaa16.txt
+package-contains-documentation-outside-usr-share-doc [usr/share/pygac/gapfilled_tles/TLE_noaa16.txt]
=====================================
debian/rules
=====================================
@@ -8,6 +8,7 @@ include /usr/share/dpkg/pkg-info.mk
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
export PYGAC_CONFIG_FILE=${CURDIR}/debian/pygac-test.cfg
+export SETUPTOOLS_SCM_PRETEND_VERSION=$(DEB_VERSION_UPSTREAM)
%:
dh $@ --with python3 --buildsystem=pybuild
@@ -16,7 +17,3 @@ override_dh_auto_clean:
dh_auto_clean
$(RM) -r pygac.egg-info
$(RM) pygac/version.py
-
-override_dh_auto_configure:
- echo "version = '$(DEB_VERSION_UPSTREAM)'" > pygac/version.py
- dh_auto_configure
=====================================
doc/rtd_environment.yaml
=====================================
@@ -0,0 +1,27 @@
+name: readthedocs
+channels:
+ - conda-forge
+dependencies:
+ - python=3.9
+ - numpy
+ - scipy
+ - bottleneck
+ - python-dateutil
+ - hdf5
+ - h5py
+ - graphviz
+ - setuptools
+ - setuptools_scm
+ - setuptools_scm_git_archive
+ - sphinx
+ - sphinx_rtd_theme
+ - sphinxcontrib-apidoc
+ - pip
+ - pip:
+ - docutils
+ - pyorbital
+ - python-geotiepoints
+ - trollimage
+ - pyspectral
+ - pyorbital
+ - .. # relative path to the pygac project
=====================================
doc/source/_static/.gitkeep
=====================================
=====================================
doc/source/introduction.rst
=====================================
@@ -18,9 +18,9 @@ obtained from `NOAA CLASS`_, where you can also find a comprehensive
.. _NOAA CLASS:
https://www.class.noaa.gov/
.. _POD:
- https://www.ncei.noaa.gov/pub/data/satellite/publications/podguides/N-15%20thru%20N-19/
-.. _KLM:
https://www.ncei.noaa.gov/pub/data/satellite/publications/podguides/TIROS-N%20thru%20N-14/
+.. _KLM:
+ https://www.ncei.noaa.gov/pub/data/satellite/publications/podguides/N-15%20thru%20N-19/
.. _introduction:
https://www.class.noaa.gov/release/data_available/avhrr/index.htm
@@ -44,4 +44,4 @@ Related Projects
.. _level1c4pps: https://github.com/foua-pps/level1c4pps
.. _NWCSAF/PPS: https://www.nwcsaf.org/16
-.. _pygac-fdr: https://github.com/pytroll/pygac-fdr
\ No newline at end of file
+.. _pygac-fdr: https://github.com/pytroll/pygac-fdr
=====================================
pygac/calibration.py
=====================================
@@ -59,7 +59,7 @@ class Calibrator(object):
'name': 'PATMOS-x, v2017r1',
'status': CoeffStatus.NOMINAL
},
- '87ae8f270e63d17178b0e764c5869f4f': {
+ '689386c822de18a07194ac7fd71652ea': {
'name': 'PATMOS-x, v2017r1, with provisional coefficients for MetOp-C',
'status': CoeffStatus.PROVISIONAL
}
@@ -156,9 +156,11 @@ class Calibrator(object):
@classmethod
def read_coeffs(cls, coeffs_file):
"""Read calibration coefficients for all satellites from file.
- Argument
+
+ Args:
coeffs_file (str): path to coefficients file
- Returns
+
+ Returns:
coeffs (dict): dictionary containing coefficients for all satellites
version (str): version of the coefficients (None if unknown)
"""
=====================================
pygac/data/calibration.json
=====================================
@@ -201,23 +201,23 @@
"channel_1": {
"dark_count": 40.41,
"gain_switch": 498.68,
- "s0": 0.10699999999916181,
- "s1": 0.0,
- "s2": -0.0
+ "s0": 0.10866666666666668,
+ "s1": 7.424,
+ "s2": -2.579
},
"channel_2": {
"dark_count": 40.94,
"gain_switch": 500.01,
- "s0": 0.10633333333441988,
- "s1": 0.0,
- "s2": -0.0
+ "s0": 0.13,
+ "s1": -0.9,
+ "s2": 1.278
},
"channel_3a": {
"dark_count": 40.57,
"gain_switch": 498.72,
- "s0": 0.1032,
- "s1": 0.0,
- "s2": -0.0
+ "s0": 0.16228571428571428,
+ "s1": -45.535,
+ "s2": 20.122
},
"channel_3b": {
"b0": 0.0,
View it on GitLab: https://salsa.debian.org/debian-gis-team/pygac/-/compare/9f6578a2ada7e33df98e3544967fc2f513ecf0ef...e109af13b3dd31a25b0e3e92111ada91cbc4f6c8
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pygac/-/compare/9f6578a2ada7e33df98e3544967fc2f513ecf0ef...e109af13b3dd31a25b0e3e92111ada91cbc4f6c8
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/20220808/86fc9ad5/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list