search

astro-datalab / notebooks-latest

Default set of Data Lab notebooks, by DL team and contributed by users
BSD 3-Clause "New" or "Revised" License
57 stars 48 forks source link

NB Disclaimer and Acks update - DH batch #231

Closed kareninysimba closed 4 months ago

kareninysimba commented 5 months ago

@i-olin, please kindly review this PR.

Section Disclaimer & attribution has been updated with the new one indicated by Robert N. for 11 assigned notebooks and their html versions were updated accordingly:

./04_HowTos/AuthClient/How_to_use_the_Data_Lab_AuthClient.ipynb ./04_HowTos/CrossmatchTables/Examples_using_pre_crossmatched_tables.ipynb ./04_HowTos/CrossmatchTables/How_to_crossmatch_tables.ipynb ./04_HowTos/CrossmatchTables/How_to_use_pre_crossmatched_tables.ipynb ./04_HowTos/QueryClient/How_to_query_DESI_EDR_Data.ipynb ./04_HowTos/QueryClient/How_to_use_the_Data_Lab_QueryClient.ipynb ./04_HowTos/SiaService/How_to_use_the_Simple_Image_Access_service.ipynb ./04_HowTos/SPARCL/How_to_use_SPARCL.ipynb ./04_HowTos/SPARCL/Plot_SPARCL_Spectra_with_Jdaviz.ipynb ./04_HowTos/SPARCL/Plot_SPARCL_Spectra_with_Prospect.ipynb ./04_HowTos/StoreClient/How_to_use_the_Data_Lab_StoreClient.ipynb

rnikutta commented 4 months ago

Hi @kareninysimba and @i-olin I'm seeing a bunch of conflict-related strings in this batch. (Look for strings like

<<<<<<< HEAD
    "__version__ = '20240603' # yyyymmdd\n",
=======
    "__version__ = '20240604' # yyyymmdd\n",
>>>>>>> 10486aa (NB Disclaimer and Acks update - DH batch (no output clearing))

Best if you re-do the batch. Pull a fresh branch from master branch @kareninysimba

kareninysimba commented 4 months ago

Argh!... on it now