Skip to content

Commit

Permalink
Format based on ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
FL550 committed Aug 21, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent b44a7d9 commit 15128e1
Showing 23 changed files with 118 additions and 118 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -24,7 +24,8 @@
],
"[python]": {
"editor.defaultFormatter": "charliermarsh.ruff"
}
},
"python.analysis.typeCheckingMode": "basic"
},
"extensions": [
"ms-python.black-formatter",
4 changes: 4 additions & 0 deletions .ruff.toml
Original file line number Diff line number Diff line change
@@ -9,11 +9,15 @@ select = [

ignore = [
"ANN101", # Missing type annotation for `self` in method
"ANN201", # Missing return type annotation for public function
"ANN401", # Dynamically typed expressions (typing.Any) are disallowed
"D103", # Missing docstring in public function
"D203", # no-blank-line-before-class (incompatible with formatter)
"D212", # multi-line-summary-first-line (incompatible with formatter)
"COM812", # incompatible with formatter
"ISC001", # incompatible with formatter
"RUF012" # Mutable class attributes should be annotated with `typing.ClassVar`
"FBT002", # Boolean default positional argument in function definition
]

[lint.flake8-pytest-style]
162 changes: 88 additions & 74 deletions simple_dwd_weatherforecast/dwdforecast.py

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions tests/test_get_daily_condition.py
Original file line number Diff line number Diff line change
@@ -8,8 +8,7 @@
class Weather_get_daily_condition(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_daily_max.py
Original file line number Diff line number Diff line change
@@ -9,8 +9,7 @@
class Weather_get_daily_max(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_daily_min.py
Original file line number Diff line number Diff line change
@@ -9,8 +9,7 @@
class Weather_get_daily_min(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_daily_sum.py
Original file line number Diff line number Diff line change
@@ -9,8 +9,7 @@
class Weather_get_daily_sum(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_day_values.py
Original file line number Diff line number Diff line change
@@ -7,8 +7,7 @@
class Weather_get_day_values(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

def test_day_not_current_day(self):
test_time = datetime(2020, 11, 7, 10, 0)
3 changes: 1 addition & 2 deletions tests/test_get_forecast_condition.py
Original file line number Diff line number Diff line change
@@ -8,8 +8,7 @@
class Weather_get_forecast_condition(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_forecast_data.py
Original file line number Diff line number Diff line change
@@ -9,8 +9,7 @@
class Weather_get_forecast_data(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_station_name.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import unittest
from unittest.mock import patch
from simple_dwd_weatherforecast import dwdforecast
from dummy_data import parsed_data


class Weather_get_station_name(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.forecast_data = parsed_data # type: ignore

def test_get_station_name(self):
self.assertEqual(self.dwd_weather.get_station_name(), "Burbach-Wuergendorf")
3 changes: 1 addition & 2 deletions tests/test_get_timeframe_avg.py
Original file line number Diff line number Diff line change
@@ -9,8 +9,7 @@
class Weather_get_timeframe_avg(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_timeframe_condition.py
Original file line number Diff line number Diff line change
@@ -8,8 +8,7 @@
class Weather_get_timeframe_condition(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_timeframe_max.py
Original file line number Diff line number Diff line change
@@ -9,8 +9,7 @@
class Weather_get_timeframe_max(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_timeframe_min.py
Original file line number Diff line number Diff line change
@@ -9,8 +9,7 @@
class Weather_get_timeframe_min(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_timeframe_sum.py
Original file line number Diff line number Diff line change
@@ -9,8 +9,7 @@
class Weather_get_timeframe_sum(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
def test_shouldupdate(self, mock_update):
3 changes: 1 addition & 2 deletions tests/test_get_timeframe_values.py
Original file line number Diff line number Diff line change
@@ -7,8 +7,7 @@
class Weather_get_timeframe_values(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

def test_timeframe_6(self):
test_time = datetime(2020, 11, 7, 1, 0)
3 changes: 1 addition & 2 deletions tests/test_is_in_timerange.py
Original file line number Diff line number Diff line change
@@ -7,8 +7,7 @@
class Weather_is_in_timerange(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

def test_is_in_timerange(self):
test_time = datetime(2020, 11, 7, 3, 30)
5 changes: 2 additions & 3 deletions tests/test_is_valid_timeframe.py
Original file line number Diff line number Diff line change
@@ -6,8 +6,7 @@
class Weather_is_valid_timeframe(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

def test_is_day(self):
self.assertTrue(self.dwd_weather.is_valid_timeframe(24))
@@ -25,4 +24,4 @@ def test_is_zero(self):
self.assertFalse(self.dwd_weather.is_valid_timeframe(0))

def test_is_negative(self):
self.assertFalse(self.dwd_weather.is_valid_timeframe(-5))
self.assertFalse(self.dwd_weather.is_valid_timeframe(-5))
4 changes: 2 additions & 2 deletions tests/test_station.py
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ def test_is_valid_station_id_false(self):

def test_is_valid_station_id_empty_string(self):
self.assertFalse(dwdforecast.load_station_id(""))
self.assertFalse(dwdforecast.load_station_id(1))
self.assertFalse(dwdforecast.load_station_id("1"))

def test_get_station_by_name(self):
self.assertEqual(dwdforecast.get_station_by_name("Ulm")[0], "10838")
self.assertEqual(dwdforecast.get_station_by_name("Ulm")[0], "10838") # type: ignore
3 changes: 1 addition & 2 deletions tests/test_update.py
Original file line number Diff line number Diff line change
@@ -9,8 +9,7 @@
class WeatherUpdate(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

@patch(
"simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",
5 changes: 2 additions & 3 deletions tests/test_update_hourly.py
Original file line number Diff line number Diff line change
@@ -2,15 +2,14 @@
from unittest.mock import patch
from simple_dwd_weatherforecast import dwdforecast
from dummy_data import parsed_data
from datetime import datetime, timezone, timedelta
from datetime import datetime, timezone
import time


class WeatherUpdate(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("H889")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

def test_download(self):
self.dwd_weather.update(force_hourly=True)
5 changes: 2 additions & 3 deletions tests/test_weather.py
Original file line number Diff line number Diff line change
@@ -6,8 +6,7 @@
class WeatherInit(unittest.TestCase):
def setUp(self):
self.dwd_weather = dwdforecast.Weather("L821")
self.dwd_weather.forecast_data = parsed_data
self.dwd_weather.station_name = "BAD HOMBURG"
self.dwd_weather.forecast_data = parsed_data # type: ignore

def test_init_with_wrong_id(self):
with self.assertRaises(ValueError) as _:
@@ -19,7 +18,7 @@ def test_init_with_number(self):

def test_init_with_no_id(self):
with self.assertRaises(TypeError) as _:
dwdforecast.Weather()
dwdforecast.Weather() # type: ignore

def test_uv_index(self):
self.assertEqual(self.dwd_weather.nearest_uv_index_station, "10637")

0 comments on commit 15128e1

Please sign in to comment.