Pulling from remote

ioos · Oct 25, 2024 · fc95533 · fc95533
2 parents a3220d2 + 2fe5015
commit fc95533
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
       files: requirements-dev.txt
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.11.1
+  rev: v1.11.2
   hooks:
   - id: mypy
     exclude: docs/source/conf.py
@@ -50,7 +50,7 @@ repos:
     - id: add-trailing-comma
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.5.6
+  rev: v0.6.3
   hooks:
     - id: ruff
       args: ["--fix", "--show-fixes"]

diff --git a/gliderpy/__init__.py b/gliderpy/__init__.py
@@ -12,6 +12,10 @@
     "GliderDataFetcher",
     "plot_track",
     "plot_transect",
+<<<<<<< HEAD
     "plot_cast",
+=======
+>>>>>>> 2fe5015a6ade7d18d3150995bdd3ff1b6c7f6da6
     "plot_ts",
+    "plot_cast",
 ]
diff --git a/notebooks/01-plotting_intro.ipynb b/notebooks/01-plotting_intro.ipynb
@@ -46,7 +46,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### plot_ctd\n",
+    "### plot_cast\n",
     "\n",
     "This method groups all the casts by their position (latitude and longitude) giving the user access to each individual cast using the index (`profile_number`) of the grouped DataFrame."
    ]
@@ -57,7 +57,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "fig, ax = df.plot_ctd(profile_number=0, var=\"temperature\", color=\"blue\")"
+    "fig, ax = df.plot_cast(profile_number=0, var=\"temperature\", color=\"blue\")"
    ]
   },
   {
@@ -73,10 +73,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "fig, ax0 = df.plot_ctd(profile_number=0, var=\"temperature\", color=\"blue\")\n",
+    "fig, ax0 = df.plot_cast(profile_number=0, var=\"temperature\", color=\"blue\")\n",
     "\n",
     "ax1 = ax0.twiny()\n",
-    "df.plot_ctd(profile_number=0, var=\"salinity\", color=\"red\", ax=ax1)\n",
+    "df.plot_cast(profile_number=0, var=\"salinity\", color=\"red\", ax=ax1)\n",
     "\n",
     "ax0.legend()\n",
     "ax1.legend()"

diff --git a/tests/test_plotting.py b/tests/test_plotting.py
@@ -77,7 +77,11 @@ def test_plot_transect_size(glider_data):
 
 @pytest.mark.mpl_image_compare(baseline_dir=root.joinpath("baseline/"))
 def test_plot_cast(glider_data):
+<<<<<<< HEAD
     """Test plot_ctd accessor."""
+=======
+    """Test plot_cast accessor."""
+>>>>>>> 2fe5015a6ade7d18d3150995bdd3ff1b6c7f6da6
     fig, ax = plot_cast(glider_data, 0, var="temperature", color="blue")
     return fig