Merge pull request #159 from pysat/text_file_bug

Bugfixes: file reading and downloads. Merging without review, since no other developers are actively working.

Author: aburrell

.github/workflows/main.yml

@@ -16,19 +16,19 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.10", "3.13"]
         numpy_ver: ["latest"]
         test_config: ["latest"]
         include:
           # NEP29 compliance settings
-          - python-version: "3.10"
-            numpy_ver: "1.24"
+          - python-version: "3.11"
+            numpy_ver: "2.0"
             os: ubuntu-latest
             test_config: "NEP29"
           # Operational compliance settings
-          - python-version: "3.9"
-            numpy_ver: "1.23.5"
-            os: "ubuntu-20.04"
+          - python-version: "3.12"
+            numpy_ver: "2.0"
+            os: "ubuntu-latest"
             test_config: "Ops"
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with numpy ${{ matrix.numpy_ver }}

CHANGELOG.md

@@ -3,6 +3,12 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+[0.2.2] - 2025-10-XX
+--------------------
+* Bugs
+  * Fixed the remote location where NOAA Dst files are located
+  * Fixed error in loading the 45-day F10.7 forecasts
+
 [0.2.1] - 2024-11-18
 --------------------
 * Enhancements

pyproject.toml

@@ -21,10 +21,10 @@ classifiers = [
   "License :: OSI Approved :: BSD License",
   "Natural Language :: English",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Operating System :: POSIX :: Linux",
   "Operating System :: MacOS :: MacOS X",
   "Operating System :: Microsoft :: Windows"

pysatSpaceWeather/instruments/methods/swpc.py

@@ -875,7 +875,7 @@ def recent_ap_f107_download(name, date_array, data_path,
 
         # Get the F107
         raw_f107 = raw_data.split('45-DAY F10.7 CM FLUX FORECAST')[-1]
-        raw_f107 = raw_f107.split('\n')[1:-4]
+        raw_f107 = raw_f107.split('\n')[1:10]
 
         # Parse the data
         ap_times, ap = parse_45day_block(raw_ap)

pysatSpaceWeather/instruments/sw_dst.py

@@ -286,7 +286,7 @@ def download(date_array, tag, inst_id, data_path, mock_download_dir=None):
 
             # User anonymous, passwd anonymous@
             ftp.login()
-            ftp.cwd('/STP/GEOMAGNETIC_DATA/INDICES/DST')
+            ftp.cwd('/STP/space-weather/geomagnetic-data/INDICES/DST')
 
         # Data stored by year. Only download for unique set of input years.
         years = np.array([date.year for date in date_array])

pysatSpaceWeather/tests/test_instruments.py

@@ -49,6 +49,21 @@ class TestInstruments(clslib.InstLibTests):
 
     """
 
+    def test_45day_forecast_data_length(self):
+        """Test that the downloaded 45-day forecasts load 45 days of data."""
+        # Initalize the desired instrument parameters
+        inst_dict = {'inst_module': pysatSpaceWeather.instruments.sw_f107,
+                     'tag': '45day', 'inst_id': ''}
+        _, date = clslib.initialize_test_inst_and_date(inst_dict)
+
+        # Load the downloaded data
+        self.test_inst = pysat.Instrument(**inst_dict)
+        self.test_inst.load(date=date)
+
+        # Test that 45 days of F10.7 data are available
+        assert len(self.test_inst['f107']) == 45
+        return
+
 
 class TestSWInstrumentLogging(object):
     """Test logging messages raised under instrument-specific conditions."""