Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions-88b009e471
Browse files Browse the repository at this point in the history
  • Loading branch information
mgrover1 authored Nov 1, 2024
2 parents 690852e + 9db6ad6 commit f21b116
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions intake_esm/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,8 @@ def search(

if derivedcat_results:
# Merge results from the main and the derived catalogs
esmcat_results = (
pd.concat([esmcat_results, *derivedcat_results])
.drop_duplicates()
.reset_index(drop=True)
)
esmcat_results = pd.concat([esmcat_results, *derivedcat_results])
esmcat_results = esmcat_results[~esmcat_results.astype(str).duplicated()]

cat = self.__class__({'esmcat': self.esmcat.dict(), 'df': esmcat_results})
cat.esmcat.catalog_file = None # Don't save the catalog file
Expand Down

0 comments on commit f21b116

Please sign in to comment.