From 65d79576f7a7f195df1f6aa314611cf59d0c412a Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Tue, 14 Jun 2022 16:16:07 +0000 Subject: [PATCH 1/6] #80 Update devcontainer --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 143c0f4..595477a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-slim +FROM python:3.10-slim ENV POETRY_VIRTUALENVS_CREATE=false diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f45819a..948b7c7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "deshima-sensitivity", "build": { "context": "..", - "dockerfile": "Dockerfile", + "dockerfile": "Dockerfile" }, "postCreateCommand": "poetry install", "extensions": [ @@ -10,7 +10,7 @@ "mhutchie.git-graph", "ms-python.python", "streetsidesoftware.code-spell-checker", - "tamasfe.even-better-toml", + "tamasfe.even-better-toml" ], "settings": { "files.insertFinalNewline": true, @@ -21,7 +21,7 @@ "[python]": { "editor.formatOnSave": true, "editor.insertSpaces": true, - "editor.tabSize": 4, - }, - }, + "editor.tabSize": 4 + } + } } From 1692cdd817dcde4518b8f5d79dec82ef95be6038 Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Tue, 14 Jun 2022 16:23:50 +0000 Subject: [PATCH 2/6] #80 Update README budges --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 39c93e6..292e91a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # deshima-sensitivity -[![PyPI](https://img.shields.io/pypi/v/deshima-sensitivity.svg?label=PyPI&style=flat-square)](https://pypi.org/pypi/deshima-sensitivity/) -[![Python](https://img.shields.io/pypi/pyversions/deshima-sensitivity.svg?label=Python&color=yellow&style=flat-square)](https://pypi.org/pypi/deshima-sensitivity/) -[![Test](https://img.shields.io/github/workflow/status/deshima-dev/deshima-sensitivity/Test?logo=github&label=Test&style=flat-square)](https://github.com/deshima-dev/deshima-sensitivity/actions) -[![License](https://img.shields.io/badge/license-MIT-blue.svg?label=License&style=flat-square)](LICENSE) -[![DOI](https://img.shields.io/badge/DOI-10.5281/zenodo.3966839-blue?style=flat-square)](https://doi.org/10.5281/zenodo.3966839) +[![Release](https://img.shields.io/pypi/v/deshima-sensitivity?label=Release&color=cornflowerblue&style=flat-square)](https://pypi.org/pypi/deshima-sensitivity/) +[![Python](https://img.shields.io/pypi/pyversions/deshima-sensitivity?label=Python&color=cornflowerblue&style=flat-square)](https://pypi.org/pypi/deshima-sensitivity/) +[![Downloads](https://img.shields.io/pypi/dm/deshima-sensitivity?label=Downloads&color=cornflowerblue&style=flat-square)](https://pepy.tech/project/deshima-sensitivity) +[![DOI](https://img.shields.io/badge/DOI-10.5281/zenodo.3966839-cornflowerblue?style=flat-square)](https://doi.org/10.5281/zenodo.3966839) +[![Tests](https://img.shields.io/github/workflow/status/deshima-dev/deshima-sensitivity/Tests?label=Tests&style=flat-square)](https://github.com/deshima-dev/deshima-sensitivity/actions/tests.yml) Sensitivity calculator for DESHIMA-type spectrometers From 309bc028a68bee901abca7309542bac53547909e Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Tue, 14 Jun 2022 16:24:28 +0000 Subject: [PATCH 3/6] #80 Update docs config --- docs/conf.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 2693688..c919b4b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,25 +1,30 @@ -# Project information -project = "deshima-sensitivity" -copyright = "2020 DESHIMA software team" -author = "Akira Endo" -release = "0.4.0" +# project information +author = "DESHIMA software team" +copyright = "2020-2022 DESHIMA software team" -# General configuration +# general configuration +add_module_names = False +autodoc_typehints = "both" +autodoc_typehints_format = "short" +exclude_patterns = [ + "_build", + "Thumbs.db", + ".DS_Store", +] extensions = [ "myst_parser", "sphinx.ext.autodoc", - "sphinx.ext.viewcode", - "sphinx.ext.napoleon", "sphinx.ext.autosummary", + "sphinx.ext.napoleon", + "sphinx.ext.viewcode", ] templates_path = ["_templates"] -exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] -# Options for HTML output -html_static_path = ["_static"] +# options for HTML output html_logo = "_static/logo.png" +html_static_path = ["_static"] html_theme = "pydata_sphinx_theme" html_theme_options = { "github_url": "https://github.com/deshima-dev/deshima-sensitivity/", From 899bb8fa240a4bc23f13a1575e7ac3a32aeeb8e3 Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Tue, 14 Jun 2022 16:24:36 +0000 Subject: [PATCH 4/6] #80 Update year period of license --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 46cacd5..e252ea6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 DESHIMA software team +Copyright (c) 2020-2022 DESHIMA software team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From e40764c60b081920d93bda440ba7906397513fdc Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Tue, 14 Jun 2022 16:26:08 +0000 Subject: [PATCH 5/6] =?UTF-8?q?#80=20Update=20package=20version=20(0.4.0?= =?UTF-8?q?=20=E2=86=92=200.4.1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- deshima_sensitivity/__init__.py | 2 +- pyproject.toml | 2 +- sensitivity.ipynb | 2 +- tests/test_package.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 292e91a..d00b7dc 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Click the budge below to open it in [Google colaboratory](http://colab.research. ### Stable version (recommended) -[![open stable version in colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/deshima-dev/deshima-sensitivity/blob/v0.4.0/sensitivity.ipynb) +[![open stable version in colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/deshima-dev/deshima-sensitivity/blob/v0.4.1/sensitivity.ipynb) ### Latest version diff --git a/deshima_sensitivity/__init__.py b/deshima_sensitivity/__init__.py index 10e394d..eefa46f 100644 --- a/deshima_sensitivity/__init__.py +++ b/deshima_sensitivity/__init__.py @@ -13,7 +13,7 @@ """ # flake8: noqa -__version__ = "0.4.0" +__version__ = "0.4.1" # modules diff --git a/pyproject.toml b/pyproject.toml index 71a37e4..6892e2c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "deshima-sensitivity" -version = "0.4.0" +version = "0.4.1" description = "Sensitivity calculator for DESHIMA-type spectrometers" authors = ["Akira Endo "] maintainers = [ diff --git a/sensitivity.ipynb b/sensitivity.ipynb index a92170e..7a98bb7 100644 --- a/sensitivity.ipynb +++ b/sensitivity.ipynb @@ -23,7 +23,7 @@ "metadata": {}, "outputs": [], "source": [ - "!pip install -q \"deshima-sensitivity==0.4.0\"" + "! pip install -q \"deshima-sensitivity==0.4.1\"" ] }, { diff --git a/tests/test_package.py b/tests/test_package.py index 33aae5f..eee0d34 100644 --- a/tests/test_package.py +++ b/tests/test_package.py @@ -2,4 +2,4 @@ def test_version(): - assert __version__ == "0.4.0" + assert __version__ == "0.4.1" From 6b4d9f7ec99d38003339c9f93565c0662ca3a225 Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Tue, 14 Jun 2022 16:28:26 +0000 Subject: [PATCH 6/6] #80 Disable fail-fast in test workflow --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 19b8969..cf1a0c1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,6 +15,7 @@ jobs: env: POETRY_VIRTUALENVS_CREATE: false strategy: + fail-fast: false matrix: python: ["3.7", "3.8", "3.9", "3.10"] steps: