Merge remote-tracking branch 'origin/main' into pr/KevinShuman/575

This merge to fix issues with numpy.in1d, transfer_tests.py, and update gitignore

Author: selipot

.github/workflows/ci.yml

@@ -36,14 +36,16 @@ jobs:
         shell: bash -l {0}
         run: coverage run -m pytest -c pyproject.toml
       - name: Display report
+        if: always() && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10'
         shell: bash -l {0}
         run: coverage report -i
       - name: Create coverage report
+        if: always() && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10'
         shell: bash -l {0}
         run: |
               coverage xml -i
       - name: Upload coverage report to Codecov
-        if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10'
+        if: always() && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10'
         uses: codecov/codecov-action@v4
         with:
           file: ./coverage.xml

.gitignore

@@ -87,10 +87,10 @@ ipython_config.py
 __pypackages__/
 
 # Environments
-.env
-.venv
-env/
-venv/
+.env*
+.venv*
+env*/
+venv*/
 ENV/
 env.bak/
 venv.bak/

README.md

@@ -7,7 +7,7 @@
 [![NSF-2126413](https://img.shields.io/badge/NSF-2126413-blue.svg)](https://nsf.gov/awardsearch/showAward?AWD_ID=2126413)
 [![Zenodo DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11081647.svg)](https://doi.org/10.5281/zenodo.11081647)
 [![JOSS DOI](https://joss.theoj.org/papers/10.21105/joss.06742/status.svg)](https://doi.org/10.21105/joss.06742)
-[![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2FCloud-Drift%2Fclouddrift&count_bg=%2368C563&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://hits.seeyoufarm.com)
+![View count](https://hitscounter.dev/api/hit?url=https%3A%2F%2Fgithub.com%2FCloud-Drift%2Fclouddrift&label=Visit&icon=github&color=%236ea8fe&message=&style=flat&tz=UTC)
 
 ### 📦 Distributions
 [![Available on conda-forge](https://anaconda.org/conda-forge/clouddrift/badges/version.svg?style=flat-square)](https://anaconda.org/conda-forge/clouddrift/)

clouddrift/adapters/gdp/__init__.py

@@ -42,7 +42,6 @@
     "drogue_lost_date",
     "typedeath",
     "typebuoy",
-    "location_type",
     "DeployingShip",
     "DeploymentStatus",
     "BuoyTypeManufacturer",
@@ -53,7 +52,6 @@
     "Transmissions",
     "DeployingCountry",
     "DeploymentComments",
-    "ManufactureYear",
     "ManufactureMonth",
     "ManufactureSensorType",
     "ManufactureVoltage",
@@ -187,7 +185,7 @@ def order_by_date(df: pd.DataFrame, idx: list[int]) -> list[int]:  # noqa: F821
     idx : list
         Unique set of drifter IDs sorted by their start date.
     """
-    return df.ID[np.where(np.in1d(df.ID, idx))[0]].values  # type: ignore
+    return df.ID[np.where(np.isin(df.ID, idx))[0]].values  # type: ignore
 
 
 def fetch_netcdf(url: str, file: str):