diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index d4d7b1e..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "python.testing.pytestArgs": ["tests", "-s"], - "python.testing.unittestEnabled": false, - "python.testing.pytestEnabled": true, - "files.exclude": { - "**/__pycache__": true - } -} diff --git a/gismeteo/mock/data/weather.json b/gismeteo/mock/data/weather.json index ed4e1a8..f089bd8 100644 --- a/gismeteo/mock/data/weather.json +++ b/gismeteo/mock/data/weather.json @@ -1 +1 @@ -{"location":"Змиевка","date":"2024-07-26","period":"day","values":[{"date":"2024-07-26T00:00:00","cloudness":"Облачно, без осадков","temperature":15,"wind_speed":1,"wind_gust":1,"wind_direction":"СВ","precipitation":0.0,"pressure":738,"humidity":96},{"date":"2024-07-26T03:00:00","cloudness":"Ясно","temperature":14,"wind_speed":0,"wind_gust":1,"wind_direction":"штиль","precipitation":0.0,"pressure":738,"humidity":98},{"date":"2024-07-26T06:00:00","cloudness":"Ясно","temperature":15,"wind_speed":1,"wind_gust":1,"wind_direction":"С","precipitation":0.0,"pressure":738,"humidity":97},{"date":"2024-07-26T09:00:00","cloudness":"Ясно","temperature":22,"wind_speed":1,"wind_gust":3,"wind_direction":"СВ","precipitation":0.0,"pressure":739,"humidity":66},{"date":"2024-07-26T12:00:00","cloudness":"Малооблачно, без осадков","temperature":24,"wind_speed":2,"wind_gust":5,"wind_direction":"СВ","precipitation":0.0,"pressure":739,"humidity":47},{"date":"2024-07-26T15:00:00","cloudness":"Облачно, без осадков","temperature":25,"wind_speed":2,"wind_gust":5,"wind_direction":"СВ","precipitation":0.0,"pressure":739,"humidity":40},{"date":"2024-07-26T18:00:00","cloudness":"Облачно, без осадков","temperature":25,"wind_speed":2,"wind_gust":5,"wind_direction":"СВ","precipitation":0.0,"pressure":740,"humidity":39},{"date":"2024-07-26T21:00:00","cloudness":"Ясно","temperature":18,"wind_speed":1,"wind_gust":5,"wind_direction":"СВ","precipitation":0.0,"pressure":741,"humidity":62}]} \ No newline at end of file +{"location":"Орел","date":"2024-07-29","period":"day","values":[{"date":"2024-07-29T00:00:00","sky":{"cloudness":"mainly_cloudy","precipitation":"small_rain","thunder":false,"fog":false},"temperature":20,"wind_speed":1,"wind_gust":1,"wind_direction":"SW","precipitation":0.0,"pressure":744,"humidity":85},{"date":"2024-07-29T03:00:00","sky":{"cloudness":"mainly_cloudy","precipitation":"small_rain","thunder":false,"fog":false},"temperature":19,"wind_speed":1,"wind_gust":1,"wind_direction":"W","precipitation":0.6,"pressure":743,"humidity":97},{"date":"2024-07-29T06:00:00","sky":{"cloudness":"mainly_cloudy","precipitation":"rain","thunder":false,"fog":false},"temperature":19,"wind_speed":1,"wind_gust":3,"wind_direction":"S","precipitation":3.3,"pressure":741,"humidity":95},{"date":"2024-07-29T09:00:00","sky":{"cloudness":"cloudy","precipitation":"small_rain","thunder":false,"fog":false},"temperature":21,"wind_speed":3,"wind_gust":10,"wind_direction":"SW","precipitation":0.3,"pressure":740,"humidity":80},{"date":"2024-07-29T12:00:00","sky":{"cloudness":"party_cloudy","precipitation":"no","thunder":false,"fog":false},"temperature":21,"wind_speed":4,"wind_gust":12,"wind_direction":"W","precipitation":0.0,"pressure":740,"humidity":60},{"date":"2024-07-29T15:00:00","sky":{"cloudness":"cloudy","precipitation":"no","thunder":false,"fog":false},"temperature":22,"wind_speed":4,"wind_gust":11,"wind_direction":"SW","precipitation":0.0,"pressure":739,"humidity":50},{"date":"2024-07-29T18:00:00","sky":{"cloudness":"cloudy","precipitation":"no","thunder":false,"fog":false},"temperature":20,"wind_speed":4,"wind_gust":11,"wind_direction":"SW","precipitation":0.0,"pressure":738,"humidity":57},{"date":"2024-07-29T21:00:00","sky":{"cloudness":"cloudy","precipitation":"no","thunder":false,"fog":false},"temperature":17,"wind_speed":2,"wind_gust":8,"wind_direction":"SW","precipitation":0.0,"pressure":737,"humidity":74}]} \ No newline at end of file diff --git a/weather.code-workspace b/weather.code-workspace new file mode 100644 index 0000000..a73e1d3 --- /dev/null +++ b/weather.code-workspace @@ -0,0 +1,30 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "python.testing.pytestArgs": ["tests", "-s"], + "python.testing.unittestEnabled": false, + "python.testing.pytestEnabled": true, + "files.exclude": { + "**/__pycache__": true + }, + "terminal.integrated.env.linux": { + "PYTHONPATH": "${workspaceFolder}" + } + }, + "launch": { + "version": "0.2.1", + "configurations": [ + { + "name": "app", + "type": "debugpy", + "request": "launch", + "module": "uvicorn", + "args": ["weather.main:app", "--reload"] + } + ] + } +} diff --git a/weather/app.py b/weather/app/__init__.py similarity index 100% rename from weather/app.py rename to weather/app/__init__.py diff --git a/weather/route/__init__.py b/weather/app/route/__init__.py similarity index 100% rename from weather/route/__init__.py rename to weather/app/route/__init__.py diff --git a/weather/route/api.py b/weather/app/route/api.py similarity index 100% rename from weather/route/api.py rename to weather/app/route/api.py diff --git a/weather/route/doc/__init__.py b/weather/app/route/doc/__init__.py similarity index 100% rename from weather/route/doc/__init__.py rename to weather/app/route/doc/__init__.py diff --git a/weather/route/doc/static/redoc.standalone.js b/weather/app/route/doc/static/redoc.standalone.js similarity index 100% rename from weather/route/doc/static/redoc.standalone.js rename to weather/app/route/doc/static/redoc.standalone.js diff --git a/weather/route/doc/static/swagger-ui-bundle.js b/weather/app/route/doc/static/swagger-ui-bundle.js similarity index 100% rename from weather/route/doc/static/swagger-ui-bundle.js rename to weather/app/route/doc/static/swagger-ui-bundle.js diff --git a/weather/route/doc/static/swagger-ui.css b/weather/app/route/doc/static/swagger-ui.css similarity index 100% rename from weather/route/doc/static/swagger-ui.css rename to weather/app/route/doc/static/swagger-ui.css diff --git a/weather/route/view/__init__.py b/weather/app/route/view/__init__.py similarity index 100% rename from weather/route/view/__init__.py rename to weather/app/route/view/__init__.py diff --git a/weather/route/view/filters.py b/weather/app/route/view/filters.py similarity index 100% rename from weather/route/view/filters.py rename to weather/app/route/view/filters.py diff --git a/weather/route/view/static/favicon.ico b/weather/app/route/view/static/favicon.ico similarity index 100% rename from weather/route/view/static/favicon.ico rename to weather/app/route/view/static/favicon.ico diff --git a/weather/route/view/static/index.js b/weather/app/route/view/static/index.js similarity index 100% rename from weather/route/view/static/index.js rename to weather/app/route/view/static/index.js diff --git a/weather/route/view/static/style.css b/weather/app/route/view/static/style.css similarity index 100% rename from weather/route/view/static/style.css rename to weather/app/route/view/static/style.css diff --git a/weather/route/view/templates/index.html b/weather/app/route/view/templates/index.html similarity index 100% rename from weather/route/view/templates/index.html rename to weather/app/route/view/templates/index.html diff --git a/weather/route/view/templates/weather.html b/weather/app/route/view/templates/weather.html similarity index 100% rename from weather/route/view/templates/weather.html rename to weather/app/route/view/templates/weather.html