From f63bd3729a7ea4c3a2245536d289d9c00fa6cffd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 18:49:56 +0000 Subject: [PATCH 1/7] Bump gitpython from 3.1.32 to 3.1.34 Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.32 to 3.1.34. - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES) - [Commits](https://github.com/gitpython-developers/GitPython/compare/3.1.32...3.1.34) --- updated-dependencies: - dependency-name: gitpython dependency-type: indirect ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 6cd0aecc..fc46cd10 100644 --- a/poetry.lock +++ b/poetry.lock @@ -984,13 +984,13 @@ smmap = ">=3.0.1,<6" [[package]] name = "gitpython" -version = "3.1.32" +version = "3.1.34" description = "GitPython is a Python library used to interact with Git repositories" optional = false python-versions = ">=3.7" files = [ - {file = "GitPython-3.1.32-py3-none-any.whl", hash = "sha256:e3d59b1c2c6ebb9dfa7a184daf3b6dd4914237e7488a1730a6d8f6f5d0b4187f"}, - {file = "GitPython-3.1.32.tar.gz", hash = "sha256:8d9b8cb1e80b9735e8717c9362079d3ce4c6e5ddeebedd0361b228c3a67a62f6"}, + {file = "GitPython-3.1.34-py3-none-any.whl", hash = "sha256:5d3802b98a3bae1c2b8ae0e1ff2e4aa16bcdf02c145da34d092324f599f01395"}, + {file = "GitPython-3.1.34.tar.gz", hash = "sha256:85f7d365d1f6bf677ae51039c1ef67ca59091c7ebd5a3509aa399d4eda02d6dd"}, ] [package.dependencies] From a54e571fd649e218fdf1746ad7813995390e40bd Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Thu, 21 Sep 2023 13:01:32 +1000 Subject: [PATCH 2/7] Updated version numbers --- pyproject.toml | 2 +- vasttools/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 61148afa..1e001719 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "vasttools" -version = "3.0.0" +version = "3.0.0-dev" description = "Python module to interact with ASKAP VAST data." license = "MIT" homepage = "https://github.com/askap-vast/vasttools/" diff --git a/vasttools/__init__.py b/vasttools/__init__.py index b5db0892..9e8350d0 100644 --- a/vasttools/__init__.py +++ b/vasttools/__init__.py @@ -9,7 +9,7 @@ ''' __author__ = 'Dougal Dobie, Adam Stewart' -__version__ = "3.0.0" +__version__ = "3.0.0-dev" RELEASED_EPOCHS = { From cd516c9e0d0c2f4a86091135b15967ebd1895fcc Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Thu, 21 Sep 2023 13:08:38 +1000 Subject: [PATCH 3/7] Added DOI badge to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aefdcc40..8276bf94 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # VAST Tools - +[![DOI](https://zenodo.org/badge/199943719.svg)](https://zenodo.org/badge/latestdoi/199943719) [![astropy](http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat)](http://www.astropy.org/) ![Tests](https://github.com/askap-vast/vast-tools/actions/workflows/pytest.yml/badge.svg) [![documentation](https://img.shields.io/badge/docs-mkdocs%20material-blue.svg?style=flat)](https://vast-survey.org/vast-tools/) From 981ac0d5986c3a222dae8b14da6003122c4ef7a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 21:22:59 +0000 Subject: [PATCH 4/7] Bump cryptography from 41.0.3 to 41.0.4 Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.3 to 41.0.4. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/41.0.3...41.0.4) --- updated-dependencies: - dependency-name: cryptography dependency-type: indirect ... Signed-off-by: dependabot[bot] --- poetry.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/poetry.lock b/poetry.lock index 6cd0aecc..071d5cb5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -636,34 +636,34 @@ toml = ["tomli"] [[package]] name = "cryptography" -version = "41.0.3" +version = "41.0.4" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." optional = false python-versions = ">=3.7" files = [ - {file = "cryptography-41.0.3-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:652627a055cb52a84f8c448185922241dd5217443ca194d5739b44612c5e6507"}, - {file = "cryptography-41.0.3-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:8f09daa483aedea50d249ef98ed500569841d6498aa9c9f4b0531b9964658922"}, - {file = "cryptography-41.0.3-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4fd871184321100fb400d759ad0cddddf284c4b696568204d281c902fc7b0d81"}, - {file = "cryptography-41.0.3-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84537453d57f55a50a5b6835622ee405816999a7113267739a1b4581f83535bd"}, - {file = "cryptography-41.0.3-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:3fb248989b6363906827284cd20cca63bb1a757e0a2864d4c1682a985e3dca47"}, - {file = "cryptography-41.0.3-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:42cb413e01a5d36da9929baa9d70ca90d90b969269e5a12d39c1e0d475010116"}, - {file = "cryptography-41.0.3-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:aeb57c421b34af8f9fe830e1955bf493a86a7996cc1338fe41b30047d16e962c"}, - {file = "cryptography-41.0.3-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:6af1c6387c531cd364b72c28daa29232162010d952ceb7e5ca8e2827526aceae"}, - {file = "cryptography-41.0.3-cp37-abi3-win32.whl", hash = "sha256:0d09fb5356f975974dbcb595ad2d178305e5050656affb7890a1583f5e02a306"}, - {file = "cryptography-41.0.3-cp37-abi3-win_amd64.whl", hash = "sha256:a983e441a00a9d57a4d7c91b3116a37ae602907a7618b882c8013b5762e80574"}, - {file = "cryptography-41.0.3-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5259cb659aa43005eb55a0e4ff2c825ca111a0da1814202c64d28a985d33b087"}, - {file = "cryptography-41.0.3-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:67e120e9a577c64fe1f611e53b30b3e69744e5910ff3b6e97e935aeb96005858"}, - {file = "cryptography-41.0.3-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:7efe8041897fe7a50863e51b77789b657a133c75c3b094e51b5e4b5cec7bf906"}, - {file = "cryptography-41.0.3-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:ce785cf81a7bdade534297ef9e490ddff800d956625020ab2ec2780a556c313e"}, - {file = "cryptography-41.0.3-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:57a51b89f954f216a81c9d057bf1a24e2f36e764a1ca9a501a6964eb4a6800dd"}, - {file = "cryptography-41.0.3-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:4c2f0d35703d61002a2bbdcf15548ebb701cfdd83cdc12471d2bae80878a4207"}, - {file = "cryptography-41.0.3-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:23c2d778cf829f7d0ae180600b17e9fceea3c2ef8b31a99e3c694cbbf3a24b84"}, - {file = "cryptography-41.0.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:95dd7f261bb76948b52a5330ba5202b91a26fbac13ad0e9fc8a3ac04752058c7"}, - {file = "cryptography-41.0.3-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:41d7aa7cdfded09b3d73a47f429c298e80796c8e825ddfadc84c8a7f12df212d"}, - {file = "cryptography-41.0.3-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d0d651aa754ef58d75cec6edfbd21259d93810b73f6ec246436a21b7841908de"}, - {file = "cryptography-41.0.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:ab8de0d091acbf778f74286f4989cf3d1528336af1b59f3e5d2ebca8b5fe49e1"}, - {file = "cryptography-41.0.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a74fbcdb2a0d46fe00504f571a2a540532f4c188e6ccf26f1f178480117b33c4"}, - {file = "cryptography-41.0.3.tar.gz", hash = "sha256:6d192741113ef5e30d89dcb5b956ef4e1578f304708701b8b73d38e3e1461f34"}, + {file = "cryptography-41.0.4-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:80907d3faa55dc5434a16579952ac6da800935cd98d14dbd62f6f042c7f5e839"}, + {file = "cryptography-41.0.4-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:35c00f637cd0b9d5b6c6bd11b6c3359194a8eba9c46d4e875a3660e3b400005f"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cecfefa17042941f94ab54f769c8ce0fe14beff2694e9ac684176a2535bf9714"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e40211b4923ba5a6dc9769eab704bdb3fbb58d56c5b336d30996c24fcf12aadb"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:23a25c09dfd0d9f28da2352503b23e086f8e78096b9fd585d1d14eca01613e13"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2ed09183922d66c4ec5fdaa59b4d14e105c084dd0febd27452de8f6f74704143"}, + {file = "cryptography-41.0.4-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5a0f09cefded00e648a127048119f77bc2b2ec61e736660b5789e638f43cc397"}, + {file = "cryptography-41.0.4-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:9eeb77214afae972a00dee47382d2591abe77bdae166bda672fb1e24702a3860"}, + {file = "cryptography-41.0.4-cp37-abi3-win32.whl", hash = "sha256:3b224890962a2d7b57cf5eeb16ccaafba6083f7b811829f00476309bce2fe0fd"}, + {file = "cryptography-41.0.4-cp37-abi3-win_amd64.whl", hash = "sha256:c880eba5175f4307129784eca96f4e70b88e57aa3f680aeba3bab0e980b0f37d"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:004b6ccc95943f6a9ad3142cfabcc769d7ee38a3f60fb0dddbfb431f818c3a67"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:86defa8d248c3fa029da68ce61fe735432b047e32179883bdb1e79ed9bb8195e"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:37480760ae08065437e6573d14be973112c9e6dcaf5f11d00147ee74f37a3829"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:b5f4dfe950ff0479f1f00eda09c18798d4f49b98f4e2006d644b3301682ebdca"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:7e53db173370dea832190870e975a1e09c86a879b613948f09eb49324218c14d"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5b72205a360f3b6176485a333256b9bcd48700fc755fef51c8e7e67c4b63e3ac"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:93530900d14c37a46ce3d6c9e6fd35dbe5f5601bf6b3a5c325c7bffc030344d9"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:efc8ad4e6fc4f1752ebfb58aefece8b4e3c4cae940b0994d43649bdfce8d0d4f"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:c3391bd8e6de35f6f1140e50aaeb3e2b3d6a9012536ca23ab0d9c35ec18c8a91"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:0d9409894f495d465fe6fda92cb70e8323e9648af912d5b9141d616df40a87b8"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:8ac4f9ead4bbd0bc8ab2d318f97d85147167a488be0e08814a37eb2f439d5cf6"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:047c4603aeb4bbd8db2756e38f5b8bd7e94318c047cfe4efeb5d715e08b49311"}, + {file = "cryptography-41.0.4.tar.gz", hash = "sha256:7febc3094125fc126a7f6fb1f420d0da639f3f32cb15c8ff0dc3997c4549f51a"}, ] [package.dependencies] From 4c2564d4bf9fe6f8e14ee4e1b7a5fad590120d2d Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Sat, 23 Sep 2023 14:02:49 +1000 Subject: [PATCH 5/7] Exit nicely when invalid survey is requested for SkyView contour plot (#497) * Initial fix * Add exception test * Updated changelog * PEP8 * PEP8 --- CHANGELOG.md | 2 ++ tests/test_source.py | 36 +++++++++++++++++++++++++++++++++++- vasttools/source.py | 7 +++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83548e4f..827dc7f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### Changed +- Exit nicely when invalid survey is requested for SkyView contour plot [#497](https://github.com/askap-vast/vast-tools/pull/497) #### Fixed #### Removed #### List of PRs +- [#497](https://github.com/askap-vast/vast-tools/pull/497): feat: Exit nicely when invalid survey is requested for SkyView contour plot ## [3.0.0](https://github.com/askap-vast/vast-tools/releases/v3.0.0) (2023-09-02) diff --git a/tests/test_source.py b/tests/test_source.py index bedabb99..cd17b5b8 100644 --- a/tests/test_source.py +++ b/tests/test_source.py @@ -892,11 +892,45 @@ def test_skyview_contour_plot( return_value=[dummy_fits] ) - result = source.skyview_contour_plot(0, 'suveycode') + result = source.skyview_contour_plot(0, 'DSS2 Blue') assert isinstance(result, Figure) plt.close(result) + @pytest.mark.parametrize("pipeline", [False, True]) + def test_skyview_contour_plot_survey_fail( + self, + pipeline: bool, + source_instance: vts.Source, + dummy_fits: fits.HDUList, + mocker: MockerFixture + ) -> None: + """ + Tests the skyview_contour_plot method. + + Parametrized for pipeline and query source. + + Args: + pipeline: If 'True' then the Source is initialised as a + pipeline source. + source_instance: The pytest source_instance fixture. + dummy_fits: The pytest fixture dummy fits. + mocker: The pytest-mock mocker object. + + Returns: + None + """ + source = source_instance(pipeline=pipeline, add_cutout_data=True) + + mocker_skyview = mocker.patch( + 'vasttools.source.SkyView.get_images', + return_value=[dummy_fits] + ) + with pytest.raises(ValueError) as excinfo: + source.skyview_contour_plot(0, 'this-is-not-a-survey') + + assert str(excinfo.value).endswith('not a valid SkyView survey name') + @pytest.mark.parametrize("pipeline", [False, True]) def test_write_ann( self, diff --git a/vasttools/source.py b/vasttools/source.py index b15d2030..d91ebf4c 100644 --- a/vasttools/source.py +++ b/vasttools/source.py @@ -1651,6 +1651,7 @@ def skyview_contour_plot( Raises: ValueError: If the index is out of range. + ValueError: If the requested survey is not valid. """ if (self._cutouts_got is False) or (force): @@ -1658,6 +1659,12 @@ def skyview_contour_plot( size = self._size + surveys = list(SkyView.survey_dict.values()) + survey_list = [item for sublist in surveys for item in sublist] + + if survey not in survey_list: + raise ValueError(f"{survey} is not a valid SkyView survey name") + if index > len(self.measurements): raise ValueError(f"Cannot access {index}th measurement.") return From f84b1e68d6bf8a490db101ff96c9b67d856e0267 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Sun, 24 Sep 2023 12:48:00 +1000 Subject: [PATCH 6/7] Updated github workflow packages to latest (#496) --- .github/workflows/ci-docs.yml | 22 ++++++++++-------- .github/workflows/lint.yml | 38 +++++++++++++++--------------- .github/workflows/pytest.yml | 30 ++++++++++++------------ CHANGELOG.md | 20 ++++++++++------ poetry.lock | 44 +++++++++++++++++------------------ pyproject.toml | 3 ++- 6 files changed, 83 insertions(+), 74 deletions(-) diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 02090406..3edacb6a 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -1,23 +1,25 @@ name: ci docs + on: - push: - branches: - - master - - main + push: + branches: + - master + - main + jobs: deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 if: ${{ github.repository_owner == 'askap-vast' }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: - python-version: 3.x - - uses: Gr1N/setup-poetry@v7 + python-version: 3.9 + - uses: Gr1N/setup-poetry@v8 - name: Cache Python dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache/pypoetry/virtualenvs key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 70751d2a..8831e7ad 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,22 +7,22 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 - - uses: ricardochaves/python-lint@v1.4.0 - with: - use-pylint: false - use-pycodestyle: false - use-flake8: true - use-black: false - use-mypy: false - use-isort: false - extra-pylint-options: "" - extra-pycodestyle-options: "" - extra-flake8-options: "--select=W291,W292,F401" - # flake8 options being used: - # - W291 trailing whitespace - # - W292 no newline at end of file - # - F401 module imported but unused - extra-black-options: "" - extra-mypy-options: "" - extra-isort-options: "" + - uses: actions/checkout@v4 + - uses: ricardochaves/python-lint@v1.4.0 + with: + use-pylint: false + use-pycodestyle: false + use-flake8: true + use-black: false + use-mypy: false + use-isort: false + extra-pylint-options: "" + extra-pycodestyle-options: "" + extra-flake8-options: "--select=W291,W292,F401" + # flake8 options being used: + # - W291 trailing whitespace + # - W292 no newline at end of file + # - F401 module imported but unused + extra-black-options: "" + extra-mypy-options: "" + extra-isort-options: "" diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index bce6e85c..00289211 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -11,20 +11,20 @@ jobs: python_version: ['3.8', '3.9'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python_version }} - - uses: Gr1N/setup-poetry@v8 - - name: Cache Python dependencies - uses: actions/cache@v2 - with: - path: ~/.cache/pypoetry/virtualenvs - key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python_version }} + - uses: Gr1N/setup-poetry@v8 + - name: Cache Python dependencies + uses: actions/cache@v3 + with: + path: ~/.cache/pypoetry/virtualenvs + key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} - - name: Install python dependencies - run: poetry install - - name: Run pytests - run: | - poetry run pytest --cov=vasttools -vv + - name: Install python dependencies + run: poetry install + - name: Run pytests + run: | + poetry run pytest --cov=vasttools -vv diff --git a/CHANGELOG.md b/CHANGELOG.md index 827dc7f7..dcf95231 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,13 +10,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### Changed +- Bumped `mkdocstrings` to version `0.17.0` to avoid `mkdocstrings` error [#496](https://github.com/askap-vast/vast-tools/pull/496). +- Pinned `jinja2` to version `3.0.3` to avoid `mkdocs_autoref` error [#496](https://github.com/askap-vast/vast-tools/pull/496). +- Update github workflows to latest versions [#496](https://github.com/askap-vast/vast-tools/pull/496) - Exit nicely when invalid survey is requested for SkyView contour plot [#497](https://github.com/askap-vast/vast-tools/pull/497) + #### Fixed +- Fixed docs build process [#496](https://github.com/askap-vast/vast-tools/pull/496). + #### Removed #### List of PRs +- [#496](https://github.com/askap-vast/vast-tools/pull/496): fix: Update github workflows to latest versions - [#497](https://github.com/askap-vast/vast-tools/pull/497): feat: Exit nicely when invalid survey is requested for SkyView contour plot ## [3.0.0](https://github.com/askap-vast/vast-tools/releases/v3.0.0) (2023-09-02) @@ -125,14 +132,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### List of PRs - [#490](https://github.com/askap-vast/vast-tools/pull/490): feat: Raise exception when simbad name query returns more names than there are objects queried -- [#478](https://github.com/askap-vast/vast-tools/pull/478): fix: Account for pipeline runs with no measurement pairs file +- [#478](https://github.com/askap-vast/vast-tools/pull/478): fix: Account for pipeline runs with no measurement pairs file - [#483](https://github.com/askap-vast/vast-tools/pull/483): fix: Ensure that full image data does not persist when creating FITS cutouts from compressed HDUs - [#480](https://github.com/askap-vast/vast-tools/pull/480): feat: Added open_fits function to handle compressed image HDUs -- [#476](https://github.com/askap-vast/vast-tools/pull/476): fix: Fixed missing RMS measurements for non-detections +- [#476](https://github.com/askap-vast/vast-tools/pull/476): fix: Fixed missing RMS measurements for non-detections - [#472](https://github.com/askap-vast/vast-tools/pull/472): fix: Remove duplicates in field matching - [#470](https://github.com/askap-vast/vast-tools/pull/470): feat: Added epoch 41 - [#465](https://github.com/askap-vast/vast-tools/pull/465): feat: Added warning when querying corrected data -- [#466](https://github.com/askap-vast/vast-tools/pull/466): feat: Added epochs 38, 39 and 40 +- [#466](https://github.com/askap-vast/vast-tools/pull/466): feat: Added epochs 38, 39 and 40 - [#463](https://github.com/askap-vast/vast-tools/pull/463): fix: Fix read_selavy to force all flux & flux_err values to be positive - [#458](https://github.com/askap-vast/vast-tools/pull/458): feat: Added epoch 37 - [#453](https://github.com/askap-vast/vast-tools/pull/453): fix: Fix planet matching to correctly handle field names with/without 'A' suffix, and correctly handle empty df in init_sources @@ -151,7 +158,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - [#421](https://github.com/askap-vast/vast-tools/pull/421): feat, fix, docs: Updated Query._get_epochs to exit nicely when no epochs available & to allow lists and ints to be passed. - [#429](https://github.com/askap-vast/vast-tools/pull/429): feat: Added access to epoch 32 - [#427](https://github.com/askap-vast/vast-tools/pull/427): feat: Added access to epoch 31 -- [#425](https://github.com/askap-vast/vast-tools/pull/425): fix: Bumped pytest and lint github workflow from ubuntu-18.04 -> ubuntu-20.04 +- [#425](https://github.com/askap-vast/vast-tools/pull/425): fix: Bumped pytest and lint github workflow from ubuntu-18.04 -> ubuntu-20.04 - [#419](https://github.com/askap-vast/vast-tools/pull/419): feat: Added access to epoch 30 - [#416](https://github.com/askap-vast/vast-tools/pull/416): fix: Update match_planet_to_field to handle empty groups - [#414](https://github.com/askap-vast/vast-tools/pull/414): feat: Added access to epoch 27 @@ -253,7 +260,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - [#258](https://github.com/askap-vast/vast-tools/pull/258): feat: v2.0.0-rc.6 - [#257](https://github.com/askap-vast/vast-tools/pull/257): fix: Fix lightcurve axist limits for forced fits - [#255](https://github.com/askap-vast/vast-tools/pull/255): fix: Added if statement to catch os.getenv returning None -- [#253](https://github.com/askap-vast/vast-tools/pull/253): feat: Added filter pipeline run by MOC function +- [#253](https://github.com/askap-vast/vast-tools/pull/253): feat: Added filter pipeline run by MOC function - [#251](https://github.com/askap-vast/vast-tools/pull/251): fix: Check self.pipeline inside write_measurements - [#247](https://github.com/askap-vast/vast-tools/pull/247): feat, dep: Updated forced photometry to be a dependency - [#246](https://github.com/askap-vast/vast-tools/pull/246): fix: Fixed vaex two epoch metric analysis @@ -277,5 +284,4 @@ The release candidate 5 of v2.0.0. This was the release before the changelog was - [#221](https://github.com/askap-vast/vast-tools/pull/221) feat: Pipeline add 2 epoch Mooley style plotting - [#220](https://github.com/askap-vast/vast-tools/pull/220) fix: Issue 219 fix source names -- [#218](https://github.com/askap-vast/vast-tools/pull/218) fix: Removed bad fields from epoch 12 csv - +- [#218](https://github.com/askap-vast/vast-tools/pull/218) fix: Removed bad fields from epoch 12 csv diff --git a/poetry.lock b/poetry.lock index d1987b5d..3ae29198 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1269,13 +1269,13 @@ trio = ["async_generator", "trio"] [[package]] name = "jinja2" -version = "3.1.2" +version = "3.0.3" description = "A very fast and expressive template engine." optional = false -python-versions = ">=3.7" +python-versions = ">=3.6" files = [ - {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"}, - {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, + {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"}, + {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"}, ] [package.dependencies] @@ -2038,23 +2038,23 @@ mkdocs = ">=1.0.4" [[package]] name = "mkdocstrings" -version = "0.16.2" +version = "0.17.0" description = "Automatic documentation from sources, for MkDocs." optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.2" files = [ - {file = "mkdocstrings-0.16.2-py3-none-any.whl", hash = "sha256:671fba8a6c7a8455562aae0a3fa85979fbcef261daec5b2bac4dd1479acc14df"}, - {file = "mkdocstrings-0.16.2.tar.gz", hash = "sha256:3d8a86c283dfa21818d5b9579aa4e750eea6b5c127b43ad8b00cebbfb7f9634e"}, + {file = "mkdocstrings-0.17.0-py3-none-any.whl", hash = "sha256:103fc1dd58cb23b7e0a6da5292435f01b29dc6fa0ba829132537f3f556f985de"}, + {file = "mkdocstrings-0.17.0.tar.gz", hash = "sha256:75b5cfa2039aeaf3a5f5cf0aa438507b0330ce76c8478da149d692daa7213a98"}, ] [package.dependencies] -Jinja2 = ">=2.11.1,<4.0" -Markdown = ">=3.3,<4.0" -MarkupSafe = ">=1.1,<3.0" -mkdocs = ">=1.2,<2.0" -mkdocs-autorefs = ">=0.1,<0.4" -pymdown-extensions = ">=6.3,<10.0" -pytkdocs = ">=0.2.0,<0.13.0" +Jinja2 = ">=2.11.1" +Markdown = ">=3.3" +MarkupSafe = ">=1.1" +mkdocs = ">=1.2" +mkdocs-autorefs = ">=0.1" +pymdown-extensions = ">=6.3" +pytkdocs = ">=0.14.0" [[package]] name = "mknotebooks" @@ -3090,20 +3090,20 @@ tests = ["flake8", "loguru", "pytest", "pytest-asyncio", "pytest-cov", "pytest-m [[package]] name = "pytkdocs" -version = "0.12.0" +version = "0.16.1" description = "Load Python objects documentation." optional = false -python-versions = ">=3.6.1" +python-versions = ">=3.7" files = [ - {file = "pytkdocs-0.12.0-py3-none-any.whl", hash = "sha256:12cb4180d5eafc7819dba91142948aa7b85ad0a3ad0e956db1cdc6d6c5d0ef56"}, - {file = "pytkdocs-0.12.0.tar.gz", hash = "sha256:746905493ff79482ebc90816b8c397c096727a1da8214a0ccff662a8412e91b3"}, + {file = "pytkdocs-0.16.1-py3-none-any.whl", hash = "sha256:a8c3f46ecef0b92864cc598e9101e9c4cf832ebbf228f50c84aa5dd850aac379"}, + {file = "pytkdocs-0.16.1.tar.gz", hash = "sha256:e2ccf6dfe9dbbceb09818673f040f1a7c32ed0bffb2d709b06be6453c4026045"}, ] [package.dependencies] -astunparse = {version = ">=1.6,<2.0", markers = "python_version < \"3.9\""} +astunparse = {version = ">=1.6", markers = "python_version < \"3.9\""} [package.extras] -numpy-style = ["docstring_parser (>=0.7,<1.0)"] +numpy-style = ["docstring_parser (>=0.7)"] [[package]] name = "pytz" @@ -3895,4 +3895,4 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=6)", "pytest-black (>= [metadata] lock-version = "2.0" python-versions = "^3.8.0" -content-hash = "2ab1bd3c0aaf05c092e41b9ad1bdac2ccfaef14d33e016481dfdde6fc23cd3fe" +content-hash = "a845d15dbf0bfce32855eae13f133c489437df37e916da60a087198a9a14ed65" diff --git a/pyproject.toml b/pyproject.toml index 1e001719..bd5e2383 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ jupyterlab = "^3.1.0" jupyterlab-execute-time = "^2.0.2" jupyterlab-system-monitor = "^0.8.0" mkdocs-material = "^7.3.0" -mkdocstrings = "^0.16.0" +mkdocstrings = "^0.17.0" mkdocs-minify-plugin = "^0.4.1" mkdocs-material-extensions = "^1.0.3" mkdocs-gen-files = "^0.3.3" @@ -52,6 +52,7 @@ pytest-mock = "^3.6.1" autopep8 = "^1.5.7" pytest-cov = "^2.12.1" flake8 = "^4.0.1" +jinja2 = "3.0.3" [tool.poetry.scripts] build_lightcurves = "vasttools.bin.build_lightcurves:main" From b878c7a968d883edf32312283f2e78d1a3784e4a Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Sun, 24 Sep 2023 12:56:10 +1000 Subject: [PATCH 7/7] Preparation for 3.0.1 release --- CHANGELOG.md | 14 +++++++++++--- docs/theme/main.html | 2 +- pyproject.toml | 2 +- vasttools/__init__.py | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf95231..acca8dd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), with an added `List of PRs` section and links to the relevant PRs on the individal updates. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/askap-vast/vast-tools/compare/v3.0.0...HEAD) +## [Unreleased](https://github.com/askap-vast/vast-tools/compare/v3.0.1...HEAD) #### Added #### Changed +#### Fixed + +#### Removed + +#### List of PRs + +## [3.0.1](https://github.com/askap-vast/vast-tools/releases/v3.0.1) (2023-09-24) + +#### Changed + - Bumped `mkdocstrings` to version `0.17.0` to avoid `mkdocstrings` error [#496](https://github.com/askap-vast/vast-tools/pull/496). - Pinned `jinja2` to version `3.0.3` to avoid `mkdocs_autoref` error [#496](https://github.com/askap-vast/vast-tools/pull/496). - Update github workflows to latest versions [#496](https://github.com/askap-vast/vast-tools/pull/496) @@ -19,8 +29,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Fixed docs build process [#496](https://github.com/askap-vast/vast-tools/pull/496). -#### Removed - #### List of PRs - [#496](https://github.com/askap-vast/vast-tools/pull/496): fix: Update github workflows to latest versions diff --git a/docs/theme/main.html b/docs/theme/main.html index 55ec7a80..4f51425e 100644 --- a/docs/theme/main.html +++ b/docs/theme/main.html @@ -34,7 +34,7 @@ strong{white-space:nowrap}.md-announce} - Version 3.0.0 released! Includes access to all pilot survey data, full survey functionality, optimisation and more 🙌 Check the release notes! 👀 + Version 3.0.1 released! Includes access to all pilot survey data, full survey functionality, optimisation and more 🙌 Check the release notes! 👀 {% endblock %} diff --git a/pyproject.toml b/pyproject.toml index bd5e2383..44d5028d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "vasttools" -version = "3.0.0-dev" +version = "3.0.1" description = "Python module to interact with ASKAP VAST data." license = "MIT" homepage = "https://github.com/askap-vast/vasttools/" diff --git a/vasttools/__init__.py b/vasttools/__init__.py index 9e8350d0..02ed0530 100644 --- a/vasttools/__init__.py +++ b/vasttools/__init__.py @@ -9,7 +9,7 @@ ''' __author__ = 'Dougal Dobie, Adam Stewart' -__version__ = "3.0.0-dev" +__version__ = "3.0.1" RELEASED_EPOCHS = {