From b5bbb96ca898527edd137f01397a52ecd1ffc57f Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Tue, 14 Jun 2022 17:22:38 +0000 Subject: [PATCH 1/3] #77 Update project dependencies --- poetry.lock | 65 +++++++++++++++++++++++++++++++++++++++++++++----- pyproject.toml | 2 ++ 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2a2a068..e5bb42a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -484,6 +484,14 @@ category = "dev" optional = false python-versions = ">=3.7" +[[package]] +name = "morecopy" +version = "0.2.4" +description = "Copy even immutable objects as much as possible" +category = "main" +optional = false +python-versions = ">=3.7,<3.11" + [[package]] name = "mypy-extensions" version = "0.4.3" @@ -555,6 +563,7 @@ numpy = [ {version = ">=1.17.3", markers = "platform_machine != \"aarch64\" and platform_machine != \"arm64\" and python_version < \"3.10\""}, {version = ">=1.19.2", markers = "platform_machine == \"aarch64\" and python_version < \"3.10\""}, {version = ">=1.20.0", markers = "platform_machine == \"arm64\" and python_version < \"3.10\""}, + {version = ">=1.21.0", markers = "python_version >= \"3.10\""}, ] python-dateutil = ">=2.7.3" pytz = ">=2017.3" @@ -583,6 +592,37 @@ pytz = ">=2020.1" [package.extras] test = ["hypothesis (>=5.5.3)", "pytest (>=6.0)", "pytest-xdist (>=1.31)"] +[[package]] +name = "pandas-dataclasses" +version = "0.2.0" +description = "pandas extension for typed Series and DataFrame creation" +category = "main" +optional = false +python-versions = ">=3.7.1,<3.11" + +[package.dependencies] +morecopy = ">=0.2,<0.3" +numpy = [ + {version = ">=1.20,<1.22", markers = "python_full_version >= \"3.7.1\" and python_version < \"3.8\""}, + {version = ">=1.20,<2.0", markers = "python_version >= \"3.8\" and python_version < \"3.11\""}, +] +pandas = [ + {version = ">=1.3,<1.4", markers = "python_full_version >= \"3.7.1\" and python_version < \"3.8\""}, + {version = ">=1.3,<2.0", markers = "python_version >= \"3.8\" and python_version < \"3.11\""}, +] +typing-extensions = ">=3.10,<4.0" + +[[package]] +name = "pandas-stubs" +version = "1.2.0.61" +description = "Type annotations for Pandas" +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +typing-extensions = {version = ">=3.7.4.3", markers = "python_version < \"3.8\""} + [[package]] name = "parso" version = "0.8.3" @@ -1004,11 +1044,11 @@ python-versions = ">=3.6" [[package]] name = "typing-extensions" -version = "4.2.0" -description = "Backported and Experimental Type Hints for Python 3.7+" +version = "3.10.0.2" +description = "Backported and Experimental Type Hints for Python 3.5+" category = "main" optional = false -python-versions = ">=3.7" +python-versions = "*" [[package]] name = "uncertainties" @@ -1063,7 +1103,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = ">=3.7.1, <3.11" -content-hash = "1affea7e91807a1ad78594804987a681ca9ad14cd40584730faf07e01d2584d6" +content-hash = "76ea0aa293ee038f2bfe03542c5898342cb9860f2398b6adf9dd4fd4dbada30a" [metadata.files] alabaster = [ @@ -1343,6 +1383,10 @@ mdurl = [ {file = "mdurl-0.1.1-py3-none-any.whl", hash = "sha256:6a8f6804087b7128040b2fb2ebe242bdc2affaeaa034d5fc9feeed30b443651b"}, {file = "mdurl-0.1.1.tar.gz", hash = "sha256:f79c9709944df218a4cdb0fcc0b0c7ead2f44594e3e84dc566606f04ad749c20"}, ] +morecopy = [ + {file = "morecopy-0.2.4-py3-none-any.whl", hash = "sha256:ea6c5f998fca2127928fc1b90eccaef9850cf2ff8b975cdce978d3fb09881009"}, + {file = "morecopy-0.2.4.tar.gz", hash = "sha256:29420a75c66371c9edf05fca7fbf61096557846ebfd1e8881e0d342ac4ea9c7a"}, +] mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, @@ -1458,6 +1502,14 @@ pandas = [ {file = "pandas-1.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:09d8be7dd9e1c4c98224c4dfe8abd60d145d934e9fc1f5f411266308ae683e6a"}, {file = "pandas-1.4.2.tar.gz", hash = "sha256:92bc1fc585f1463ca827b45535957815b7deb218c549b7c18402c322c7549a12"}, ] +pandas-dataclasses = [ + {file = "pandas-dataclasses-0.2.0.tar.gz", hash = "sha256:97ca16284c9dec4f7238393b056987705beeca35896599d3e078b82369338b4b"}, + {file = "pandas_dataclasses-0.2.0-py3-none-any.whl", hash = "sha256:8be8e21172c84826d57a410d2e16464774ad5a2d43a80d694dfed8e4e2694807"}, +] +pandas-stubs = [ + {file = "pandas-stubs-1.2.0.61.tar.gz", hash = "sha256:3f2f59da7333b3fb2b216155f0ec26fefda7684d77bd35a096fb0bbdcb938f38"}, + {file = "pandas_stubs-1.2.0.61-py3-none-any.whl", hash = "sha256:afb6a8d3876af775b8627d8681e9a80bb9c60b6497e75df0329bde41104a91c9"}, +] parso = [ {file = "parso-0.8.3-py2.py3-none-any.whl", hash = "sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75"}, {file = "parso-0.8.3.tar.gz", hash = "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0"}, @@ -1715,8 +1767,9 @@ typed-ast = [ {file = "typed_ast-1.5.4.tar.gz", hash = "sha256:39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2"}, ] typing-extensions = [ - {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"}, - {file = "typing_extensions-4.2.0.tar.gz", hash = "sha256:f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376"}, + {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, + {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, + {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] uncertainties = [ {file = "uncertainties-3.1.6-py2.py3-none-any.whl", hash = "sha256:cb4a66d5ceda006475ec845bf43ee8956c26138b08f93c41851c25a4ffe19a33"}, diff --git a/pyproject.toml b/pyproject.toml index 6892e2c..55b3b34 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ pandas = [ { version = ">=1.3, <1.4", python = ">=3.7.1, <3.8" }, { version = "^1.3", python = ">=3.8, <3.11" }, ] +pandas-dataclasses = "^0.2" scipy = "^1.4" [tool.poetry.dev-dependencies] @@ -38,6 +39,7 @@ ipython = [ { version = "^8.4", python = ">=3.8, <3.11" }, ] myst-parser = "^0.18" +pandas-stubs = "^1.2" pydata-sphinx-theme = "^0.9" pytest = "^7.1" sphinx = "^5.0" From 73f284a8e5c41545271b7a03cfde3de8702c8755 Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Sat, 13 Apr 2024 14:35:37 -0400 Subject: [PATCH 2/3] #83 Use numpy.float64 instead of deprecated numpy.float --- deshima_sensitivity/atmosphere.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deshima_sensitivity/atmosphere.py b/deshima_sensitivity/atmosphere.py index d32d960..f2cbde2 100644 --- a/deshima_sensitivity/atmosphere.py +++ b/deshima_sensitivity/atmosphere.py @@ -119,7 +119,7 @@ def eta_atm_interp(eta_atm_dataframe: pd.DataFrame) -> Callable: etafun = desim.eta_atm_interp(eta_atm_df) """ - x = np.array(list(eta_atm_dataframe)[1:]).astype(np.float) + x = np.array(list(eta_atm_dataframe)[1:]).astype(np.float64) y = eta_atm_dataframe["F"].values z = eta_atm_dataframe.iloc[:, 1:].values return interp2d(x, y, z, kind="cubic") From 35209abd86991ddf2f65c98d996390d968359d7b Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Sat, 13 Apr 2024 14:45:15 -0400 Subject: [PATCH 3/3] =?UTF-8?q?#83=20Update=20package=20version=20(0.4.1?= =?UTF-8?q?=20=E2=86=92=200.4.2)?= 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 d00b7dc..1aa8653 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.1/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.2/sensitivity.ipynb) ### Latest version diff --git a/deshima_sensitivity/__init__.py b/deshima_sensitivity/__init__.py index eefa46f..7b65dcc 100644 --- a/deshima_sensitivity/__init__.py +++ b/deshima_sensitivity/__init__.py @@ -13,7 +13,7 @@ """ # flake8: noqa -__version__ = "0.4.1" +__version__ = "0.4.2" # modules diff --git a/pyproject.toml b/pyproject.toml index 55b3b34..076ab72 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "deshima-sensitivity" -version = "0.4.1" +version = "0.4.2" description = "Sensitivity calculator for DESHIMA-type spectrometers" authors = ["Akira Endo "] maintainers = [ diff --git a/sensitivity.ipynb b/sensitivity.ipynb index 7a98bb7..e920871 100644 --- a/sensitivity.ipynb +++ b/sensitivity.ipynb @@ -23,7 +23,7 @@ "metadata": {}, "outputs": [], "source": [ - "! pip install -q \"deshima-sensitivity==0.4.1\"" + "! pip install -q \"deshima-sensitivity==0.4.2\"" ] }, { diff --git a/tests/test_package.py b/tests/test_package.py index eee0d34..f45afbe 100644 --- a/tests/test_package.py +++ b/tests/test_package.py @@ -2,4 +2,4 @@ def test_version(): - assert __version__ == "0.4.1" + assert __version__ == "0.4.2"