From a386e32df0a0809dbec532cedd29388f5ee7908f Mon Sep 17 00:00:00 2001 From: Benjamin Winkel Date: Sun, 14 Apr 2024 23:34:19 +0200 Subject: [PATCH] prepare release v2.0.2 --- CHANGES.rst | 19 +++++++++++++++++++ README.rst | 38 +++++++------------------------------- azure-pipelines.yml | 8 ++++---- pyproject.toml | 3 +-- 4 files changed, 31 insertions(+), 37 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index bdc4e227..94b8f2f2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,22 @@ +2.0.2 (2024-04-14) +======================= + +New Features +------------ +pycraf.pathprof +^^^^^^^^^^^^^^ +- Add an option to `pycraf.pathprof.height_map_data`, which allows to + retrieve longitude and latitude profiles to each pixel in a map. This + could, for example, be used for adding clutter heights along the paths. + [#de42379] +- Add an option to return raw data from `pathprof.gis.regrid_from_geotiff`. + (May be needed for cases where proper normalisation is required.) [#64] + +Various +------- +- Migrate to Cython v3. [#63] +- Use new package structure (`pyproject.toml`-only). [#65] + 2.0.1 (2022-11-19) ======================= diff --git a/README.rst b/README.rst index ee2628fe..1b0bfa34 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ pycraf ****** -- *Version:* 2.0.1 +- *Version:* 2.0.2 - *Authors:* Benjamin Winkel, Marta Bautista, Federico Di Vruno, Gyula I. G. Józsa - *User manual:* `stable `__ | @@ -40,10 +40,10 @@ Project Status Features ======== -- Full implementation of `ITU-R Rec. P.452-16 `_ that allows to calculate path - attenuation for the distance between interferer and victim service. Supports +- Full implementation of `ITU-R Rec. P.452-17 `_ that allows to calculate path + attenuation for the distance between interferer and victim service (`ITU-R Rec. P.452-18 `_ is possible with adding clutter heights manually.). Supports to load NASA's `Shuttle Radar Topography Mission (SRTM) `_ data for height-profile generation. -- Full implementation of `ITU-R Rec. P.676-10 `_, which provides two atmospheric +- Full implementation of `ITU-R Rec. P.676-13 `_, which provides two atmospheric models to calculate the attenuation for paths through Earth's atmosphere. - Provides various antenna patterns necessary for compatibility studies (e.g., RAS, IMT, fixed-service links). @@ -87,11 +87,11 @@ itself is published under `GPL v3 `_. +subpackage implements the algorithm described in `ITU-R Recommendation P.676 `_. Annex 1 of this Recommendation makes use of spectroscopic information of the oxygen and water vapour lines given in Tables 1 and 2 of P.676. Another example are the radiometeorological data files that are distributed alongside -`ITU-R Rec. P.452-16 `_ +`ITU-R Rec. P.452-17 `_ ITU kindly gave us permission to include data files into pycraf that are distributed with the Recommendations on the ITU servers. This makes it possible @@ -130,30 +130,6 @@ extract (or clone from GitHub) and simply execute:: python -m pip install . -Dependencies ------------- - -We kept the dependencies as minimal as possible. The following packages are -required: - -* Python 3.9 or later -* setuptools -* cython 0.29 or later -* numpy 1.20 or later -* astropy 4.0 or later -* scipy 1.7 or later -* pytest 5.4 or later -* pytest-remotedata 0.3.3 or later - -The following packages are optional, and you will need them for certain -features and to build the docs: - -* h5py 3.3 or later; for caching -* matplotlib 3.4 or later; for some plot helpers -* pyproj 2.6 or later; for the `geospatial` subpackage -* sgp4 2.0 or later; for the `satellite` subpackage -* rasterio 1.2 or later; for the `satellite` subpackage - For further details, we refer to the online documention `installation instructions `_. It also includes some hints for running pycraf on Windows or MacOS. Older versions @@ -163,7 +139,7 @@ SRTM data --------- To make full use of the path attenuation calculations provided by pycraf -(implements `ITU-R Rec. P.452 `_), we recommend to use NASA's +(implements `ITU-R Rec. P.452 `_), we recommend to use NASA's `Shuttle Radar Topography Mission (SRTM) `_ data for height-profile generation. pycraf can work with so-called *.hgt* files, a very simple binary format. Each *.hgt* file, a so-called tile, just diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2bddc8d1..0f09bbbe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,8 +26,8 @@ jobs: variables: arch: x86_64 - plat: manylinux2010_x86_64 - image: quay.io/pypa/manylinux2010_x86_64 + plat: manylinux_2_28_x86_64 + image: quay.io/pypa/manylinux_2_28_x86_64 python.architecture: x64 sphinx.version: '>=3.0' astropy.version: '' @@ -310,14 +310,14 @@ jobs: - script: | pip install twine ls dist/*.whl - python -m twine upload -r "pypi_pycraf" --config-file $(PYPIRC_PATH) dist/*.whl + python -m twine upload -r "pypi_pycraf" --skip-existing --config-file $(PYPIRC_PATH) dist/*.whl displayName: Upload wheels, Linux/MacOS condition: and(succeeded(), eq(variables['publish.wheels'], true), not(startsWith(variables['Agent.OS'], 'Windows'))) - script: | pip install twine ls dist/*.whl - python -m twine upload -r "pypi_pycraf" --config-file %PYPIRC_PATH% dist/*.whl + python -m twine upload -r "pypi_pycraf" --skip-existing --config-file %PYPIRC_PATH% dist/*.whl displayName: Upload wheels, Windows condition: and(succeeded(), eq(variables['publish.wheels'], true), startsWith(variables['Agent.OS'], 'Windows')) diff --git a/pyproject.toml b/pyproject.toml index 77d7effb..4b7d1400 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,10 +34,9 @@ keywords = [ dependencies = [ "astropy", "build", - "imagemagick", "ipdb", "matplotlib", - "numpy==1.23.4", + "numpy", "pip", "pyproj", "pytest",