Maint giles

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
       submodules: false
       coverage: codecov
       toxdeps: tox-pypi-filter
-      posargs: -n auto
+      posargs:
       envs: |
         - windows: py311
         - macos: py310

docs/reference/index.rst

@@ -5,7 +5,7 @@ Reference
 Software and API.
 
 .. automodapi:: smart
-.. automodapi:: smart.map_processing
+.. automodapi:: smart.processing
 .. automodapi:: smart.differential_rotation
 .. automodapi:: smart.indexed_grown_mask
 .. automodapi:: smart.calculate_properties

examples/full_walkthrough.py

@@ -11,16 +11,18 @@
 from smart.calculate_properties import dB_dt, get_properties, smart_indentify_and_characterize
 from smart.differential_rotation import diff_rotation
 from smart.indexed_grown_mask import index_and_grow_mask
-from smart.map_processing import smart_prep
+from smart.processing import smart_prep
 
 #####################################################
 #
 
 hmi_map = Map(
-    "https://solmon.dias.ie/data/2024/06/06/HMI/fits/hmi.m_720s_nrt.20240606_230000_TAI.3.magnetogram.fits"
+    "http://jsoc.stanford.edu/data/hmi/fits/2024/06/06/hmi.M_720s.20240606_230000_TAI.fits"
+    # "https://solmon.dias.ie/data/2024/06/06/HMI/fits/hmi.m_720s_nrt.20240606_230000_TAI.3.magnetogram.fits"
 )
 hmi_map_prev = Map(
-    "https://solmon.dias.ie/data/2024/06/06/HMI/fits/hmi.m_720s_nrt.20240606_000000_TAI.3.magnetogram.fits"
+    "http://jsoc.stanford.edu/data/hmi/fits/2024/06/06/hmi.M_720s.20240606_000000_TAI.fits"
+    # "https://solmon.dias.ie/data/2024/06/06/HMI/fits/hmi.m_720s_nrt.20240606_000000_TAI.3.magnetogram.fits"
 )
 
 threshold_map, cos_correction = smart_prep(hmi_map)

examples/smart_process.py

@@ -13,7 +13,7 @@
 from smart.calculate_properties import cosine_weighted_area_map, dB_dt, extract_features, get_properties
 from smart.differential_rotation import diff_rotation
 from smart.indexed_grown_mask import index_and_grow_mask, plot_indexed_grown_mask
-from smart.map_processing import (
+from smart.processing import (
     calculate_cosine_correction,
     cosine_correct_data,
     map_threshold,
@@ -31,10 +31,10 @@
 #
 # We start by creating a sunpy.Map from our .fits file.
 
-# hmi_map = Map("http://jsoc.stanford.edu/data/hmi/fits/2024/06/06/hmi.M_720s.20240606_230000_TAI.fits")
-hmi_map = Map(
-    "https://solmon.dias.ie/data/2024/06/06/HMI/fits/hmi.m_720s_nrt.20240606_230000_TAI.3.magnetogram.fits"
-)
+hmi_map = Map("http://jsoc.stanford.edu/data/hmi/fits/2024/06/06/hmi.M_720s.20240606_230000_TAI.fits")
+# hmi_map = Map(
+#     "https://solmon.dias.ie/data/2024/06/06/HMI/fits/hmi.m_720s_nrt.20240606_230000_TAI.3.magnetogram.fits"
+# )
 
 #####################################################
 # We'll also plot this map to see how it looks before applying any of the SMART processes.
@@ -64,10 +64,10 @@
 # This time we'll simply use the `~smart.map_processing.smart_prep` function to create our thresholded map and calculate the corrected data. This function performs the
 # `~smart.map_processing.smooth_los_threshold`, `~smart.map_processing.calculate_cosine_correction`, and `~smart.map_processing.cosine_correct_data` functions.
 
-# hmi_map_prev = Map("http://jsoc.stanford.edu/data/hmi/fits/2024/06/05/hmi.M_720s.20240605_230000_TAI.fits")
-hmi_map_prev = Map(
-    "https://solmon.dias.ie/data/2024/06/06/HMI/fits/hmi.m_720s_nrt.20240606_000000_TAI.3.magnetogram.fits"
-)
+hmi_map_prev = Map("http://jsoc.stanford.edu/data/hmi/fits/2024/06/06/hmi.M_720s.20240606_000000_TAI.fits")
+# hmi_map_prev = Map(
+#     "https://solmon.dias.ie/data/2024/06/06/HMI/fits/hmi.m_720s_nrt.20240606_000000_TAI.3.magnetogram.fits"
+# )
 thresholded_map_prev, cos_correction_prev = smart_prep(hmi_map_prev)
 
 #####################################################

pyproject.toml

@@ -12,10 +12,8 @@ requires-python = ">=3.9"
 readme = { file = "README.rst", content-type = "text/x-rst" }
 license = { file = "licenses/LICENSE.rst", content-type = "text/plain" }
 dependencies = [
-  "numpy",
-  "sunpy[map]",
-  "scikit-image",
-  "matplotlib"
+  "sunpy[map]>=5.1",
+  "scikit-image>=0.24"
 ]
 dynamic = ["version"]
 
@@ -45,5 +43,62 @@ exclude = ["smart._dev*"]
 [tool.setuptools_scm]
 write_to = "smart/_version.py"
 
+[tool.gilesbot]
+  [tool.gilesbot.pull_requests]
+  enabled = true
+
+  [tool.gilesbot.towncrier_changelog]
+  enabled = true
+  verify_pr_number = true
+  changelog_skip_label = "No Changelog Entry Needed"
+  help_url = "https://github.com/TCDSolar/SMARTpy/blob/main/changelog/README.rst"
+
+  changelog_missing_long = "There isn't a changelog file in this pull request. Please add a changelog file to the `changelog/` directory following the instructions in the changelog [README](https://github.com/TCDSolar/SMARTpy/blob/main/changelog/README.rst)."
+
+  type_incorrect_long = "The changelog file you added is not one of the allowed types. Please use one of the types described in the changelog [README](https://github.com/TCDSolar/SMARTpy/blob/main/changelog/README.rst)"
+
+  number_incorrect_long = "The number in the changelog file you added does not match the number of this pull request. Please rename the file."
+
+[tool.towncrier]
+  package = "smart"
+  filename = "CHANGELOG.rst"
+  directory = "changelog/"
+  issue_format = "`#{issue} <https://github.com/TCDSolar/SMARTpy/pull/{issue}>`__"
+
+  [[tool.towncrier.type]]
+  directory = "breaking"
+  name = "Backwards Incompatible Changes"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "api"
+  name = "API Changes"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "removal"
+  name = "Deprecations and Removals"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "feature"
+  name = "Features"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "bugfix"
+  name = "Bug Fixes"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "doc"
+  name = "Improved Documentation"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "trivial"
+  name = "Trivial/Internal Changes"
+  showcontent = true
+
 [tool.mypy]
 python_version = "3.9"

smart/calculate_properties.py

@@ -6,7 +6,7 @@
 
 from smart.differential_rotation import diff_rotation
 from smart.indexed_grown_mask import index_and_grow_mask
-from smart.map_processing import calculate_cosine_correction, smart_prep
+from smart.processing import calculate_cosine_correction, smart_prep
 
 __all__ = ["cosine_weighted_area_map", "extract_features", "dB_dt", "get_properties"]