sunpy · nabobalis · Apr 21, 2023 · Apr 20, 2023 · Apr 20, 2023 · Apr 20, 2023
diff --git a/changelog/6742.feature.rst b/changelog/6742.feature.rst
@@ -3,6 +3,7 @@ The minimum required versions of several core dependencies have been updated:
 - Python 3.9
 - astropy 5.0.1
 - numpy 1.21.0
+- parfive 2.0.0
 
 The minimum required versions of these optional dependencies has also been updated:
 

diff --git a/docs/whatsnew/5.0.rst b/docs/whatsnew/5.0.rst
@@ -21,6 +21,7 @@ The minimum required versions of several core dependencies have been updated:
 - Python 3.9
 - astropy 5.0.1
 - numpy 1.21.0
+- parfive 2.0
 
 The minimum required versions of these optional dependencies has also been updated:
 

diff --git a/setup.cfg b/setup.cfg
@@ -43,7 +43,7 @@ install_requires =
   astropy>=5.0.1
   numpy>=1.21.0
   packaging>=19.0
-  parfive[ftp]>=1.2.0
+  parfive[ftp]>=2.0.0
 
 [options.extras_require]
 # The list of available extras is also in the installation docs, if you add or remove one please edit it there as well.

diff --git a/sunpy/conftest.py b/sunpy/conftest.py
@@ -114,6 +114,16 @@ def undo_config_dir_patch():
     os.environ["SUNPY_CONFIGDIR"] = oridir
 
 
+@pytest.fixture(scope='session', autouse=True)
+def parfive_header_test(request):
+    """
+    Add a keyword to tell parfive this is a test run.
+    """
+    os.environ["PARFIVE_SUNPY_TESTS"] = "True"
+    yield
+    del os.environ["PARFIVE_SUNPY_TESTS"]
+
+
 @pytest.fixture(scope='session', autouse=True)
 def hide_parfive_progress(request):
     """

diff --git a/sunpy/data/data_manager/tests/test_downloader.py b/sunpy/data/data_manager/tests/test_downloader.py
@@ -1,9 +1,8 @@
 from unittest.mock import patch
 
-import parfive
 import pytest
-from packaging.version import Version
 from parfive import Results
+from parfive.results import Error
 
 from sunpy.data.data_manager.downloader import DownloaderError, ParfiveDownloader
 
@@ -12,15 +11,8 @@ def test_ParfiveDownloader_errors():
     """
     Test that ParfiveDownloader raises an error when the download fails.
     """
-
     downloader = ParfiveDownloader()
     results = Results()
-
-    # TODO: Remove this when we support parfive 2.0.
-    if Version(parfive.__version__) >= Version("2.0.0"):
-        from parfive.results import Error
-    else:
-        Error = results._error
     results.errors.append(Error("", "FAKE_URL", ValueError("TEST_ERROR")))
     with patch('parfive.Downloader.download') as download:
         download.return_value = results

@@ -398,10 +398,7 @@ def fetch(self, *query_results, path=None, max_conn=5, progress=True,
             if is_jsoc_only:
                 max_conn = 1
                 max_splits = 1
-            if parfive_version >= Version("2.0.0"):
-                downloader = Downloader(max_conn=max_conn, progress=progress, overwrite=overwrite, max_splits=max_splits)
-            else:
-                downloader = Downloader(max_conn=max_conn, progress=progress, overwrite=overwrite)
+            downloader = Downloader(max_conn=max_conn, progress=progress, overwrite=overwrite, max_splits=max_splits)
         elif not isinstance(downloader, parfive.Downloader):
             raise TypeError("The downloader argument must be a parfive.Downloader instance.")
 

@@ -534,11 +534,7 @@ def get_request(self, requests, path=None, overwrite=False, progress=True,
             # Private communication from JSOC say we should not use more than one connection.
             if max_conn != self.default_max_conn:
                 log.info(f"Setting max parallel downloads to 1 for the JSOC client.")
-            if parfive_version >= Version("2.0.0"):
-                downloader = Downloader(max_conn=max_conn, progress=progress, overwrite=overwrite, max_splits=max_splits)
-            else:
-                downloader = Downloader(max_conn=max_conn, progress=progress, overwrite=overwrite)
-
+            downloader = Downloader(max_conn=max_conn, progress=progress, overwrite=overwrite, max_splits=max_splits)
         urls = []
         for request in requests:
             if request.status == 0:

diff --git a/sunpy/util/parfive_helpers.py b/sunpy/util/parfive_helpers.py
@@ -5,7 +5,7 @@
 import aiohttp
 import parfive
 from packaging.version import Version
-from parfive import Results
+from parfive import Results, SessionConfig
 
 import sunpy
 
@@ -14,36 +14,16 @@
 parfive_version = Version(parfive.__version__)
 sunpy_headers = {
     "User-Agent": f"sunpy/{sunpy.__version__} parfive/{parfive.__version__} "
-    f"aiohttp/{aiohttp.__version__} python/{sys.version[:5]}"
+    f"aiohttp/{aiohttp.__version__} python/{sys.version[:5]} "
 }
+if os.environ.get("PARFIVE_SUNPY_TESTS"):
+    sunpy_headers["User-Agent"] = f"sunpy-CI-tests/{sunpy.__version__} parfive/{parfive.__version__} "
+config = SessionConfig(headers=sunpy_headers)
 
 
-if parfive_version < Version("2.0.0"):
-    # Overload the parfive downloader class to set the User-Agent string
-    class Downloader(parfive.Downloader):
-        @wraps(parfive.Downloader.__init__)
-        def __init__(self, *args, **kwargs):
-            headers = kwargs.pop("headers", {})
-            kwargs["headers"] = {**sunpy_headers, **headers}
-            # Works with conftest to hide the progress bar.
-            progress = os.environ.get("PARFIVE_HIDE_PROGESS", None)
-            if progress:
-                kwargs["progress"] = False
-            super().__init__(*args, **kwargs)
-
-else:
-    from parfive import SessionConfig
-
-    config = SessionConfig(headers=sunpy_headers)
-
-    class Downloader(parfive.Downloader):
-        @wraps(parfive.Downloader.__init__)
-        def __init__(self, *args, **kwargs):
-            if "config" not in kwargs:
-                kwargs["config"] = config
-
-            # This is to make our sample data download code work on 1.x and 2.x
-            # when we depend on 2+ we should remove this.
-            headers = kwargs.pop("headers", {})
-            kwargs["config"].headers = {**kwargs["config"].headers, **headers}
-            super().__init__(*args, **kwargs)
+class Downloader(parfive.Downloader):
+    @wraps(parfive.Downloader.__init__)
+    def __init__(self, *args, **kwargs):
+        if "config" not in kwargs:
+            kwargs["config"] = config
+        super().__init__(*args, **kwargs)