Skip to content

Commit 11403fc

Browse files
authored
Merge pull request #409 from mwcraig/updates-for-jb-1.0.4
Updates for jb 1.0.4 and other minor cleanup
2 parents 3840956 + 434a9c1 commit 11403fc

13 files changed

Lines changed: 21 additions & 46 deletions

.github/workflows/ci_tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ jobs:
4747
shell: bash -l {0}
4848
run: |
4949
conda install -c conda-forge mamba
50-
mamba install --quiet -c conda-forge astroquery ccdproc photutils sphinx sphinxcontrib-bibtex jupyter-book=1
50+
mamba install --quiet -c conda-forge astroquery ccdproc photutils sphinx sphinxcontrib-bibtex "jupyter-book>=1.0.4,<2"
5151
conda list
5252
conda info -e
53-
# python -m pip install jupyter-book==0.12.1
5453
- name: Cache
5554
id: cache
5655
uses: actions/cache@v4

_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@ html:
6565
<a href="http://creativecommons.org/licenses/by/4.0/?ref=chooser-v1" target="_blank" rel="license noopener noreferrer" style="display:inline-block;">CC BY 4.0
6666
<img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg?ref=chooser-v1">
6767
<img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/by.svg?ref=chooser-v1"></a></p>
68-
google_analytics_id : "" # A GA id that can be used to track book views.
68+
6969
home_page_in_navbar : true # Whether to include your home page in the left Navigation Bar
7070
baseurl : "" # The base URL where your book will be hosted. Used for creating image previews and social links. e.g.: https://mypage.com/mybook/
7171
analytics:
72+
google_analytics_id : "" # A GA id that can be used to track book views.
7273

7374
comments:
7475
hypothesis : false

notebooks/photometry/01.01.02-Background-estimation-XDF.ipynb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"source": [
4545
"import numpy as np\n",
4646
"\n",
47-
"from astropy.io import fits\n",
4847
"from astropy.nddata import CCDData\n",
4948
"import astropy.units as u\n",
5049
"from astropy.stats import sigma_clipped_stats, SigmaClip\n",

notebooks/photometry/01.01.03-Background-estimation-FEDER.ipynb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@
3838
"source": [
3939
"import numpy as np\n",
4040
"\n",
41-
"from astropy.io import fits\n",
4241
"from astropy.nddata import CCDData\n",
4342
"import astropy.units as u\n",
4443
"from astropy.stats import sigma_clipped_stats, SigmaClip\n",
45-
"from astropy.visualization import ImageNormalize, LogStretch, AsymmetricPercentileInterval\n",
44+
"from astropy.visualization import ImageNormalize, AsymmetricPercentileInterval\n",
4645
"import matplotlib.pyplot as plt\n",
47-
"from matplotlib.ticker import LogLocator\n",
4846
"\n",
4947
"from photutils.segmentation import detect_threshold, detect_sources\n",
5048
"from photutils.utils import circular_footprint\n",

notebooks/photometry/01.02.01-IRAF-like-simulated-image.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@
4848
"source": [
4949
"from astropy.stats import sigma_clipped_stats, gaussian_sigma_to_fwhm\n",
5050
"from astropy.table import QTable\n",
51-
"from astropy.visualization import simple_norm, SqrtStretch\n",
51+
"from astropy.visualization import SqrtStretch\n",
5252
"from astropy.visualization.mpl_normalize import ImageNormalize\n",
5353
"\n",
5454
"import matplotlib.pyplot as plt\n",
5555
"import numpy as np\n",
5656
"\n",
5757
"from photutils.aperture import CircularAperture, EllipticalAperture\n",
58-
"from photutils.datasets import make_100gaussians_image, make_gaussian_sources_image\n",
59-
"from photutils.detection import find_peaks, DAOStarFinder\n",
58+
"from photutils.datasets import make_100gaussians_image\n",
59+
"from photutils.detection import DAOStarFinder\n",
6060
"\n",
6161
"plt.style.use('../photutils_notebook_style.mplstyle')"
6262
]

notebooks/photometry/01.02.02-IRAF-like-source-detection-XDF.ipynb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,12 @@
4242
"metadata": {},
4343
"outputs": [],
4444
"source": [
45-
"from astropy.io import fits\n",
46-
"import astropy.units as u\n",
4745
"from astropy.nddata import CCDData\n",
48-
"from astropy.stats import sigma_clipped_stats, SigmaClip\n",
4946
"from astropy.visualization import ImageNormalize, LogStretch\n",
5047
"import matplotlib.pyplot as plt\n",
5148
"from matplotlib.ticker import LogLocator\n",
5249
"import numpy as np\n",
5350
"\n",
54-
"from photutils.background import Background2D, MeanBackground\n",
5551
"from photutils.detection import DAOStarFinder, IRAFStarFinder\n",
5652
"\n",
5753
"# Show plots in the notebook\n",

notebooks/photometry/01.02.03-Source-detection-FEDER.ipynb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,14 @@
4242
"source": [
4343
"import numpy as np\n",
4444
"\n",
45-
"from astropy.io import fits\n",
4645
"from astropy.nddata import CCDData\n",
47-
"import astropy.units as u\n",
4846
"from astropy.stats import sigma_clipped_stats, SigmaClip\n",
49-
"from astropy.visualization import ImageNormalize, LogStretch, AsymmetricPercentileInterval\n",
47+
"from astropy.visualization import ImageNormalize, AsymmetricPercentileInterval\n",
5048
"import matplotlib.pyplot as plt\n",
51-
"from matplotlib.ticker import LogLocator\n",
5249
"\n",
5350
"from photutils.aperture import CircularAperture\n",
5451
"from photutils.background import Background2D, MeanBackground\n",
5552
"from photutils.detection import DAOStarFinder\n",
56-
"from photutils.segmentation import detect_threshold, detect_sources\n",
57-
"from photutils.utils import circular_footprint\n",
5853
"\n",
5954
"# Show plots in the notebook\n",
6055
"%matplotlib inline"

notebooks/photometry/01.03.01-peak_detection-simulated-image.ipynb

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,14 @@
3131
"source": [
3232
"import warnings\n",
3333
"\n",
34-
"from astropy.stats import sigma_clipped_stats, gaussian_sigma_to_fwhm\n",
35-
"from astropy.table import QTable\n",
36-
"from astropy.visualization import simple_norm, SqrtStretch\n",
34+
"from astropy.stats import sigma_clipped_stats\n",
35+
"from astropy.visualization import SqrtStretch\n",
3736
"from astropy.visualization.mpl_normalize import ImageNormalize\n",
3837
"\n",
3938
"import matplotlib.pyplot as plt\n",
40-
"import numpy as np\n",
4139
"\n",
42-
"from photutils.aperture import CircularAperture, EllipticalAperture\n",
4340
"from photutils.centroids import centroid_2dg\n",
44-
"from photutils.datasets import make_100gaussians_image, make_gaussian_sources_image\n",
41+
"from photutils.datasets import make_100gaussians_image\n",
4542
"from photutils.detection import find_peaks, DAOStarFinder\n",
4643
"\n",
4744
"plt.style.use('../photutils_notebook_style.mplstyle')"

notebooks/photometry/01.03.02-peak_detection-XDF.ipynb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,14 @@
3636
"import warnings\n",
3737
"\n",
3838
"from astropy.nddata import CCDData\n",
39-
"from astropy.stats import sigma_clipped_stats, SigmaClip\n",
40-
"import astropy.units as u\n",
39+
"from astropy.stats import sigma_clipped_stats\n",
4140
"from astropy.visualization import ImageNormalize, LogStretch\n",
4241
"\n",
4342
"import matplotlib.pyplot as plt\n",
4443
"from matplotlib.ticker import LogLocator\n",
4544
"\n",
4645
"import numpy as np\n",
4746
"\n",
48-
"from photutils.background import Background2D, MeanBackground\n",
4947
"from photutils.centroids import centroid_2dg\n",
5048
"from photutils.detection import find_peaks, DAOStarFinder, IRAFStarFinder\n",
5149
"\n",

notebooks/photometry/01.03.03-peak_detection-Feder.ipynb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,14 @@
3030
"import warnings\n",
3131
"\n",
3232
"from astropy.nddata import CCDData\n",
33-
"from astropy.stats import sigma_clipped_stats, gaussian_sigma_to_fwhm, SigmaClip\n",
34-
"from astropy.table import QTable\n",
35-
"from astropy.visualization import simple_norm, SqrtStretch\n",
33+
"from astropy.stats import sigma_clipped_stats, SigmaClip\n",
3634
"from astropy.visualization.mpl_normalize import AsymmetricPercentileInterval, ImageNormalize\n",
3735
"\n",
3836
"import matplotlib.pyplot as plt\n",
3937
"import numpy as np\n",
4038
"\n",
41-
"from photutils.aperture import CircularAperture, EllipticalAperture\n",
4239
"from photutils.background import Background2D, MeanBackground\n",
4340
"from photutils.centroids import centroid_2dg\n",
44-
"from photutils.datasets import make_100gaussians_image, make_gaussian_sources_image\n",
4541
"from photutils.detection import find_peaks, DAOStarFinder\n",
4642
"\n",
4743
"plt.style.use('../photutils_notebook_style.mplstyle')"

0 commit comments

Comments
 (0)