diff --git a/readthedocs.yml b/.readthedocs.yaml similarity index 63% rename from readthedocs.yml rename to .readthedocs.yaml index 5ec698c..59ef9f6 100644 --- a/readthedocs.yml +++ b/.readthedocs.yaml @@ -3,13 +3,21 @@ version: 2 build: os: "ubuntu-22.04" tools: - python: "3.11" + python: "3.8" # Build from the docs/ directory with Sphinx sphinx: + builder: html configuration: docs/source/conf.py # Explicitly set the version of Python and its requirements python: install: - requirements: dev-requirements.txt + - method: pip + path: . + extra_requirements: + - dev +submodules: + include: all + recursive: true diff --git a/docs/source/conf.py b/docs/source/conf.py index d36b443..7fabb0b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,4 +1,4 @@ -"""Copyright 2023 Scintillometry-Tools Contributors. +"""Copyright 2023 Scintillometry Contributors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,7 +16,8 @@ Configuration file for the Sphinx documentation builder. -For the full list of built-in configuration values, see the documentation: +For the full list of built-in configuration values, see the +documentation: https://www.sphinx-doc.org/en/master/usage/configuration.html """ @@ -49,7 +50,7 @@ def setup(app): project = "Scintillometry" copyright = f"2019-{date.today().year}, Scintillometry Contributors" author = "Scintillometry Contributors" -release = "1.0.0" +release = "1.0.4" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/pyproject.toml b/pyproject.toml index fd435ec..b55a2c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "scintillometry" -version = "1.0.0" +version = "1.0.4" authors = [ { name="Scintillometry Contributors", email="" }, ] diff --git a/src/scintillometry/main.py b/src/scintillometry/main.py index b2cf757..2ae1058 100644 --- a/src/scintillometry/main.py +++ b/src/scintillometry/main.py @@ -301,13 +301,13 @@ def perform_data_parsing(**kwargs): data_parser = DataParser.WranglerParsing() # Parse BLS, weather, and topographical data - datasets = data_parser.stitch.wrangle_data( + datasets = data_parser.wrangle_data( bls_path=kwargs["input"], transect_path=kwargs["transect_path"], calibrate=kwargs["calibration"], station_id=kwargs["station_id"], tzone=kwargs["timezone"], - source="zamg", + weather_source="zamg", ) # Parse vertical measurements diff --git a/src/scintillometry/wrangler/data_parser.py b/src/scintillometry/wrangler/data_parser.py index c729c64..6dccdf3 100644 --- a/src/scintillometry/wrangler/data_parser.py +++ b/src/scintillometry/wrangler/data_parser.py @@ -1009,7 +1009,7 @@ def wrangle_data( weather_data = self.weather.parse_weather( timestamp=bls_time, source=weather_source, - klima_id=station_id, + station_id=station_id, data_dir=weather_dir, timezone=tzone, )