From 3d399d4ad76f72b4ec80af102b81f499dfe02397 Mon Sep 17 00:00:00 2001 From: shoulinwei Date: Thu, 13 Apr 2023 12:39:05 +0800 Subject: [PATCH] reqs --- csst_dfs_api/mbi/level2.py | 1 + docs/README.md | 14 +++++++ docs/source/rst/csst_dfs_api.facility.rst | 32 +++++++++++++++ docs/source/rst/csst_dfs_api.functional.rst | 10 +++++ docs/source/rst/csst_dfs_api.ifs.rst | 43 --------------------- docs/source/rst/csst_dfs_api.mbi.rst | 29 ++++++++++++++ docs/source/rst/csst_dfs_api.mci.rst | 43 --------------------- docs/source/rst/csst_dfs_api.rst | 3 +- docs/source/rst/csst_dfs_api.sls.rst | 40 ------------------- requirements.txt | 10 ++++- tests/common/test_common_catalog.py | 7 ++-- 11 files changed, 101 insertions(+), 131 deletions(-) create mode 100644 docs/README.md create mode 100644 docs/source/rst/csst_dfs_api.functional.rst create mode 100644 docs/source/rst/csst_dfs_api.mbi.rst diff --git a/csst_dfs_api/mbi/level2.py b/csst_dfs_api/mbi/level2.py index af4586e..a114425 100644 --- a/csst_dfs_api/mbi/level2.py +++ b/csst_dfs_api/mbi/level2.py @@ -55,6 +55,7 @@ class Level2DataApi(object): dec: [float] in deg radius: [float] in deg obs_time: (start, end) + limit: limits returns the number of records,default 0:no-limit :returns: csst_dfs_common.models.Result ''' diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..4c02cd1 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,14 @@ +## Build + +```bash +make rst +make html +``` + +## Online Browse + +```bash +pip install sphinx-autobuild +cd docs +sphinx-autobuild source build/html +``` diff --git a/docs/source/rst/csst_dfs_api.facility.rst b/docs/source/rst/csst_dfs_api.facility.rst index 84cb397..33ba7c7 100644 --- a/docs/source/rst/csst_dfs_api.facility.rst +++ b/docs/source/rst/csst_dfs_api.facility.rst @@ -20,6 +20,38 @@ csst\_dfs\_api.facility.detector module :undoc-members: :show-inheritance: +csst\_dfs\_api.facility.level0 module +------------------------------------- + +.. automodule:: csst_dfs_api.facility.level0 + :members: + :undoc-members: + :show-inheritance: + +csst\_dfs\_api.facility.level0prc module +---------------------------------------- + +.. automodule:: csst_dfs_api.facility.level0prc + :members: + :undoc-members: + :show-inheritance: + +csst\_dfs\_api.facility.level1 module +------------------------------------- + +.. automodule:: csst_dfs_api.facility.level1 + :members: + :undoc-members: + :show-inheritance: + +csst\_dfs\_api.facility.level1prc module +---------------------------------------- + +.. automodule:: csst_dfs_api.facility.level1prc + :members: + :undoc-members: + :show-inheritance: + csst\_dfs\_api.facility.level2producer module --------------------------------------------- diff --git a/docs/source/rst/csst_dfs_api.functional.rst b/docs/source/rst/csst_dfs_api.functional.rst new file mode 100644 index 0000000..55afdbb --- /dev/null +++ b/docs/source/rst/csst_dfs_api.functional.rst @@ -0,0 +1,10 @@ +csst\_dfs\_api.functional package +================================= + +Module contents +--------------- + +.. automodule:: csst_dfs_api.functional + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/rst/csst_dfs_api.ifs.rst b/docs/source/rst/csst_dfs_api.ifs.rst index 2826e48..b6dd330 100644 --- a/docs/source/rst/csst_dfs_api.ifs.rst +++ b/docs/source/rst/csst_dfs_api.ifs.rst @@ -1,49 +1,6 @@ csst\_dfs\_api.ifs package ========================== -Submodules ----------- - -csst\_dfs\_api.ifs.calmerge module ----------------------------------- - -.. automodule:: csst_dfs_api.ifs.calmerge - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.ifs.level0 module --------------------------------- - -.. automodule:: csst_dfs_api.ifs.level0 - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.ifs.level0prc module ------------------------------------ - -.. automodule:: csst_dfs_api.ifs.level0prc - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.ifs.level1 module --------------------------------- - -.. automodule:: csst_dfs_api.ifs.level1 - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.ifs.level1prc module ------------------------------------ - -.. automodule:: csst_dfs_api.ifs.level1prc - :members: - :undoc-members: - :show-inheritance: - Module contents --------------- diff --git a/docs/source/rst/csst_dfs_api.mbi.rst b/docs/source/rst/csst_dfs_api.mbi.rst new file mode 100644 index 0000000..90b38fb --- /dev/null +++ b/docs/source/rst/csst_dfs_api.mbi.rst @@ -0,0 +1,29 @@ +csst\_dfs\_api.mbi package +========================== + +Submodules +---------- + +csst\_dfs\_api.mbi.level2 module +-------------------------------- + +.. automodule:: csst_dfs_api.mbi.level2 + :members: + :undoc-members: + :show-inheritance: + +csst\_dfs\_api.mbi.level2co module +---------------------------------- + +.. automodule:: csst_dfs_api.mbi.level2co + :members: + :undoc-members: + :show-inheritance: + +Module contents +--------------- + +.. automodule:: csst_dfs_api.mbi + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/rst/csst_dfs_api.mci.rst b/docs/source/rst/csst_dfs_api.mci.rst index 9e24b0a..9285d4a 100644 --- a/docs/source/rst/csst_dfs_api.mci.rst +++ b/docs/source/rst/csst_dfs_api.mci.rst @@ -1,49 +1,6 @@ csst\_dfs\_api.mci package ========================== -Submodules ----------- - -csst\_dfs\_api.mci.calmerge module ----------------------------------- - -.. automodule:: csst_dfs_api.mci.calmerge - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.mci.level0 module --------------------------------- - -.. automodule:: csst_dfs_api.mci.level0 - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.mci.level0prc module ------------------------------------ - -.. automodule:: csst_dfs_api.mci.level0prc - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.mci.level1 module --------------------------------- - -.. automodule:: csst_dfs_api.mci.level1 - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.mci.level1prc module ------------------------------------ - -.. automodule:: csst_dfs_api.mci.level1prc - :members: - :undoc-members: - :show-inheritance: - Module contents --------------- diff --git a/docs/source/rst/csst_dfs_api.rst b/docs/source/rst/csst_dfs_api.rst index c3a57c8..847239d 100644 --- a/docs/source/rst/csst_dfs_api.rst +++ b/docs/source/rst/csst_dfs_api.rst @@ -10,10 +10,11 @@ Subpackages csst_dfs_api.common csst_dfs_api.cpic csst_dfs_api.facility + csst_dfs_api.functional csst_dfs_api.hstdm csst_dfs_api.ifs + csst_dfs_api.mbi csst_dfs_api.mci - csst_dfs_api.msc csst_dfs_api.sls Module contents diff --git a/docs/source/rst/csst_dfs_api.sls.rst b/docs/source/rst/csst_dfs_api.sls.rst index 84235e8..cde9a84 100644 --- a/docs/source/rst/csst_dfs_api.sls.rst +++ b/docs/source/rst/csst_dfs_api.sls.rst @@ -4,46 +4,6 @@ csst\_dfs\_api.sls package Submodules ---------- -csst\_dfs\_api.sls.calmerge module ----------------------------------- - -.. automodule:: csst_dfs_api.sls.calmerge - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.sls.level0 module --------------------------------- - -.. automodule:: csst_dfs_api.sls.level0 - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.sls.level0prc module ------------------------------------ - -.. automodule:: csst_dfs_api.sls.level0prc - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.sls.level1 module --------------------------------- - -.. automodule:: csst_dfs_api.sls.level1 - :members: - :undoc-members: - :show-inheritance: - -csst\_dfs\_api.sls.level1prc module ------------------------------------ - -.. automodule:: csst_dfs_api.sls.level1prc - :members: - :undoc-members: - :show-inheritance: - csst\_dfs\_api.sls.level2spectra module --------------------------------------- diff --git a/requirements.txt b/requirements.txt index e3bbb37..130465f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,10 @@ astropy>=4.0 -git+https://github.com/astronomical-data-processing/csst-dfs-commons.git \ No newline at end of file +grpcio>=1.28.1 +grpcio_tools>=1.28.1 +protobuf==3.9.0 +pandas>=1.2.4 +networkx>=2.4 +matplotlib>=3.4.1 +numpy>=1.20.1 +astropy_healpix==0.7 +DBUtils==1.3 \ No newline at end of file diff --git a/tests/common/test_common_catalog.py b/tests/common/test_common_catalog.py index e4efb03..da650f4 100644 --- a/tests/common/test_common_catalog.py +++ b/tests/common/test_common_catalog.py @@ -21,9 +21,10 @@ class CommonCatalogTestCase(unittest.TestCase): obstime = -1, limit = 0 ) - # print(result) - dt = self.api.to_table(result) - dt.pprint() + print(result) + if result.success: + dt = self.api.to_table(result) + dt.pprint() # df = dt.to_pandas() # print(df.head()) print('used:', time.time()-t) -- GitLab