Merge branch 'customizable_catalog' of...

Merge branch 'customizable_catalog' of ssh://119.78.210.97:31415/data/simudata/CSSOSDataProductsSims/codes/CSST into customizable_catalog

setup.py

@@ -31,7 +31,7 @@ setup(name='CSSTSim',
     # install_requires=[
     #     'numpy>=1.18.5',
     #     'galsim>=2.2.4',
-    # 'yaml>=5.3.1',
+    #     'pyyaml>=5.3.1',
     #     'astropy>=4.0.1',
     #     'scipy>=1.5.0',
     #     'mpi4py>=3.0.3',
@@ -40,7 +40,7 @@ setup(name='CSSTSim',
     #     'h5py>=2.10.0',
     #     'Cython>=0.29.21'
     #     'numba>=0.50.1'
-    # ]
+    # ],
     package_data = {
         'ObservationSim.Astrometry.lib': ['libshao.so'], 
         'ObservationSim.MockObject.data': ['*.dat'],