3.5.3 with no warning for merge method (#121)

Author: fsoubelet

CHANGELOG.md

@@ -1,5 +1,10 @@
 # TFS-Pandas Changelog
 
+## Version 3.5.3
+
+- Changed:
+  - Fixed a wrong deprecation of the `.merge` method of `TfsDataFrames`.
+
 ## Version 3.5.2
 
 - Changed:

tfs/__init__.py

@@ -10,7 +10,7 @@
 __title__ = "tfs-pandas"
 __description__ = "Read and write tfs files."
 __url__ = "https://github.com/pylhc/tfs"
-__version__ = "3.5.2"
+__version__ = "3.5.3"
 __author__ = "pylhc"
 __author_email__ = "[email protected]"
 __license__ = "MIT"

tfs/frame.py

@@ -194,11 +194,6 @@ def merge(
         ``pandas.Dataframe`` method of the same name. Resulting headers are either merged according to the
         provided **how_headers** method or as given via **new_headers**.
 
-        ..warning::
-            This method uses ``pandas.DataFrame.merge`` internally, which has been deprecated for a
-            while and removed with pandas 2.0. It will be removed from ``tfs-pandas`` as well in the
-            next release.
-
         Args:
             right (Union[TfsDataFrame, pd.DataFrame]): The ``TfsDataFrame`` to merge with the caller.
             how_headers (str): Type of merge to be performed for the headers. Either **left** or **right**.
@@ -217,7 +212,6 @@ def merge(
         Returns:
             A new ``TfsDataFrame`` with the merged data and merged headers.
         """
-        LOGGER.warn("This method has been removed in pandas 2.0 and will be removed from TfsDataFrames too. Please use 'tfs.frame.concat' instead.")
         LOGGER.debug("Merging data through 'pandas'")
         if not hasattr(right, "headers"):
             LOGGER.debug("Converting 'right' to TfsDataFrame for merging")