From 3034e55eb0d16e724ffba3917e8345488daf0381 Mon Sep 17 00:00:00 2001 From: MARCHAND MANON Date: Fri, 26 Jul 2024 09:24:38 +0200 Subject: [PATCH 1/5] maint: prepare version 0.16.2 --- CHANGELOG.md | 2 ++ Cargo.toml | 2 +- codemeta.json | 4 ++-- python/mocpy/version.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73a9aee4..f9ebd2b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] +## [0.16.2] + ## Fixed * `MOC.from_astropy_regions` now accepts `EllipseSkyRegion` and `RectangleSkyRegion` where diff --git a/Cargo.toml b/Cargo.toml index fc4dd9eb..7b8599ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "MOCPy" -version = "0.16.1" +version = "0.16.2" authors = [ "Matthieu Baumann ", "Thomas Boch ", diff --git a/codemeta.json b/codemeta.json index c6bb318a..a76d7ccb 100644 --- a/codemeta.json +++ b/codemeta.json @@ -9,8 +9,8 @@ "dateModified": "2023-12-04", "issueTracker": "https://github.com/cds-astro/mocpy/issues", "name": "MOCpy", - "version": "0.16.1", - "softwareVersion": "0.16.1", + "version": "0.16.2", + "softwareVersion": "0.16.2", "description": "Python library to easily create and manipulate MOCs (Multi-Order Coverage maps)", "applicationCategory": ["Astronomy", "Science"], "funding": "ESCAPE 824064, ASTERICS 653477", diff --git a/python/mocpy/version.py b/python/mocpy/version.py index 113af05a..7f33bc09 100644 --- a/python/mocpy/version.py +++ b/python/mocpy/version.py @@ -1 +1 @@ -__version__ = "0.16.1" +__version__ = "0.16.2" From 7aa9416666f76a37c0e79c1904de2a482000e815 Mon Sep 17 00:00:00 2001 From: MARCHAND MANON Date: Fri, 26 Jul 2024 09:28:03 +0200 Subject: [PATCH 2/5] docs;: add the other types of MOCs --- docs/index.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 7f089035..22073b9b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -29,8 +29,9 @@ MOC is an `IVOA standard `__ enabling descriptio of arbitrary sky regions. Based on the HEALPix sky tessellation, it maps regions on the sky into hierarchically grouped predefined cells. -MOCPy provides the :py:class:`~mocpy.MOC` and :py:class:`~mocpy.TimeMOC` classes handling -respectively the manipulation of spatial and temporal MOCs. +MOCPy provides the :py:class:`~mocpy.MOC`, :py:class:`~mocpy.TimeMOC`, +:py:class:`~mocpy.FrequuencyMOC`, :py:class:`~mocpy.STMOC` classes handling +respectively the manipulation of spatial, temporal, frequency, and space-time MOCs. As an example, here is the sky coverage of the SDSS sky survey: From 1cf81f12413c09b86f7296e3ff015a248c95e483 Mon Sep 17 00:00:00 2001 From: MARCHAND MANON Date: Fri, 26 Jul 2024 10:02:15 +0200 Subject: [PATCH 3/5] fix: astropy deprecated min_cut and max_cut --- notebooks/FITS-image-pixels-intersecting-MOC.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/notebooks/FITS-image-pixels-intersecting-MOC.ipynb b/notebooks/FITS-image-pixels-intersecting-MOC.ipynb index 63779b0a..1a373a22 100644 --- a/notebooks/FITS-image-pixels-intersecting-MOC.ipynb +++ b/notebooks/FITS-image-pixels-intersecting-MOC.ipynb @@ -77,7 +77,7 @@ "im = ax.imshow(\n", " hdu[0].data,\n", " origin=\"lower\",\n", - " norm=simple_norm(hdu[0].data, \"sqrt\", min_cut=0, max_cut=150),\n", + " norm=simple_norm(hdu[0].data, \"sqrt\", vmin=0, vmax=150),\n", ")" ] }, @@ -148,7 +148,7 @@ "im = ax.imshow(\n", " img_test,\n", " origin=\"lower\",\n", - " norm=simple_norm(hdu[0].data, \"sqrt\", min_cut=0, max_cut=150),\n", + " norm=simple_norm(hdu[0].data, \"sqrt\", vmin=0, vmax=150),\n", ")" ] }, From 251cd864fe2a3610b8322dcee86f06323f32baea Mon Sep 17 00:00:00 2001 From: MARCHAND MANON Date: Fri, 26 Jul 2024 10:02:56 +0200 Subject: [PATCH 4/5] fix: broken links in doc --- .gitignore | 1 + python/mocpy/moc/moc.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d5c4a1fd..408119d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.pyd +docs/_build diff --git a/python/mocpy/moc/moc.py b/python/mocpy/moc/moc.py index 9d667c61..586e4449 100644 --- a/python/mocpy/moc/moc.py +++ b/python/mocpy/moc/moc.py @@ -633,8 +633,8 @@ def from_vizier_table(cls, table_id, max_depth=None, nside=None): releases. These catalogs contain one or more tables. Here are two webpages where you can read the - `list of catalogs https://cdsarc.cds.unistra.fr/viz-bin/moc/?format=html`_ - and the `list of tables https://cdsarc.cds.unistra.fr/viz-bin/moc/?format=html&list=tables`_ + `list of catalogs `_ + and the `list of tables `_ currently available. """ if nside: From 9ea9e8546c0f4da4245e48297507050c90541cbc Mon Sep 17 00:00:00 2001 From: MARCHAND MANON Date: Fri, 26 Jul 2024 10:03:26 +0200 Subject: [PATCH 5/5] docs: add instructions to install from source (without git) --- docs/install.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/install.rst b/docs/install.rst index 3d1595b0..772782da 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -1,6 +1,9 @@ Install ======= +Stable versions +--------------- + MOCPy relies on the following mandatory external dependencies : - `cdshealpix `__ @@ -19,3 +22,18 @@ To upgrade the ``mocpy`` package to the latest version:: To install ``mocpy`` type:: pip install mocpy + +From source +----------- + +To install MOCPy from source, you'll need `Rust `_. + +Then you can download the source code from `this link https://github.com/cds-astro/mocpy/archive/refs/heads/master.zip`_ +or directly from the GitHub repository. Once in the source code folder, you'll have to do + +:: + > pip install maturin + > maturin develop --release + > pip install . + +And you'll have the very last changes running on your machine. \ No newline at end of file