Skip to content

Commit

Permalink
merge: hotfix for incorrect interface methods (#6)
Browse files Browse the repository at this point in the history
* docs: modify rtd configuration

Refs: ST-2, ST-122

* docs: fix rtd configuration

Corrects package installation path.

Refs: ST-2, ST-122

* fix: main interface references incorrect arguments

Refs: ST-26, ST-123
  • Loading branch information
gampnico authored May 16, 2023
1 parent 47d6ed1 commit e1aac8c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
10 changes: 9 additions & 1 deletion readthedocs.yml → .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
"""

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "hatchling.build"

[project]
name = "scintillometry"
version = "1.0.0"
version = "1.0.4"
authors = [
{ name="Scintillometry Contributors", email="" },
]
Expand Down
4 changes: 2 additions & 2 deletions src/scintillometry/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/scintillometry/wrangler/data_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down

0 comments on commit e1aac8c

Please sign in to comment.