Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
c6de0cf
Changed Database to Influx
Mazkede Apr 20, 2023
0fc52bd
.
Mazkede Apr 20, 2023
eb40cda
added functionality to choose the database
Mazkede Apr 26, 2023
fca417a
correction of filename
Mazkede Apr 26, 2023
44b1d0d
delete old
Mazkede Apr 26, 2023
4e6c414
added gitignore
Mazkede Apr 27, 2023
38310ec
added Dummy
Mazkede Apr 27, 2023
dcc5798
Merge pull request #16 from Mazkede/master
thusser Jun 27, 2023
0bb5c9c
added .dockerignore
thusser Jun 27, 2023
6fb6be4
working on influx support
thusser Jul 3, 2023
4ba174e
aggregation
thusser Jul 4, 2023
a5ac18d
changed evaluators to influx
thusser Jul 4, 2023
3790a37
mysql station
thusser Jul 4, 2023
3837c9f
adopted for new influx
thusser Jul 5, 2023
072ba84
added mysqlclient
thusser Jul 5, 2023
41fda83
plot min/max
thusser Jul 5, 2023
4b662f8
install mysql client
thusser Jul 6, 2023
259296d
upgrade to chart.js 4
thusser Jul 6, 2023
feacb30
update plots instead of recreating them
thusser Jul 7, 2023
ef3f439
fixed annotations
thusser Jul 8, 2023
55056e9
fixed not found font
thusser Jul 8, 2023
14fa63e
added missing files
thusser Jul 8, 2023
fbecd3a
fixed bug
thusser Jul 26, 2023
0d1642b
avg measurement name
thusser Jul 27, 2023
cbabad3
cleaned up and introduced INFLUXDB_MEASUREMENT_AVERAGE
thusser Jul 27, 2023
fbbdf64
longer station codes
thusser Jul 27, 2023
34c67b5
longer station codes
thusser Jul 27, 2023
074f248
cleaned up
thusser Jul 27, 2023
c317794
fixed bug
thusser Jul 27, 2023
b26301d
don't plot average station
thusser Jul 27, 2023
cdc4d29
added skymag
thusser Aug 4, 2023
5cf7365
added active field for sensor
thusser Aug 7, 2023
2b7b355
added active field for sensor
thusser Aug 7, 2023
eec3c09
use Sensor's active flag
thusser Aug 7, 2023
f2525ee
only read last 5 minutes
thusser Aug 31, 2023
4cf31c4
no valid value means good weather, need to add "valid" evaluator in case
thusser Aug 31, 2023
024671e
added dewpoint
thusser Oct 2, 2023
3485888
added import
thusser Oct 2, 2023
6e61b6f
new versions
thusser Aug 15, 2024
9946f0c
added McDvt100 station
thusser Jan 13, 2025
f49ed6b
added McDvt100 station
thusser Jan 13, 2025
0b55ffc
added McDvt100 station
thusser Jan 13, 2025
4c2736a
added McDvt100 station
thusser Jan 13, 2025
ed69e30
.
thusser Jan 13, 2025
4515571
.
thusser Jan 13, 2025
427eb67
Merge remote-tracking branch 'origin/develop' into develop
thusser Jan 14, 2025
3699aab
gitlab ci
thusser Jan 14, 2025
507dbb8
auto push to gitlab
thusser Jan 14, 2025
98e110e
v1.2.0
thusser Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
*.pyc
*.pyo
*.mo
*.db
*.css.map
*.egg-info
*.sql.gz
.cache
.project
.idea
.pydevproject
.idea/workspace.xml
.DS_Store
.git/
.sass-cache
.vagrant/
__pycache__
dist
docs
env
venv
logs
src/{{ project_name }}/settings/local.py
src/node_modules
web/media
web/static/CACHE
stats
Dockerfile
LabCourse/local_settings.py
14 changes: 14 additions & 0 deletions .github/workflows/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Sync Repo to GitLab

on:
push

jobs:
sync:
runs-on: ubuntu-latest
steps:
- uses: keninkujovic/[email protected]
with:
gitlab_url: ${{ secrets.GITLAB_URL }}
username: ${{ secrets.USERNAME }}
gitlab_pat: ${{ secrets.GITLAB_PAT }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pyc
13 changes: 13 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
build:
stage: build
image:
name: gcr.io/kaniko-project/executor:v1.14.0-debug
entrypoint: [""]
script:
- /kaniko/executor
--context "${CI_PROJECT_DIR}"
--dockerfile "${CI_PROJECT_DIR}/Dockerfile"
--destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}"
--destination "${CI_REGISTRY_IMAGE}:latest"
rules:
- if: $CI_COMMIT_TAG
34 changes: 23 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@
FROM python:3.7-slim AS compile-image
RUN apt-get update \
&& apt-get install -y build-essential libmariadbclient-dev-compat \
&& rm -rf /var/lib/apt/lists/*
COPY requirements.txt .
RUN pip install --user -r requirements.txt
FROM python:3.12-slim-bookworm

FROM python:3.7-slim
ENV \
POETRY_NO_INTERACTION=1 \
POETRY_VIRTUALENVS_CREATE=false \
POETRY_CACHE_DIR='/var/cache/pypoetry' \
POETRY_HOME='/usr/local' \
OPENBLAS_NUM_THREADS=1

# install package
RUN apt-get update \
&& apt-get install -y mariadb-client \
&& apt-get install -y curl \
&& rm -rf /var/lib/apt/lists/*
COPY --from=compile-image /root/.local /root/.local
ENV PATH=/root/.local/bin:$PATH

# poetry
RUN curl -sSL https://install.python-poetry.org | python3 -

# Copy only requirements to cache them in docker layer
WORKDIR /weather
COPY . /weather/
COPY poetry.lock pyproject.toml /weather/

# Project initialization:
RUN poetry install --no-root --no-interaction --no-ansi

# copy all
COPY . /weather

CMD gunicorn --bind 0.0.0.0:8002 --workers=6 --threads=3 --worker-class=gthread pyobs_weather.wsgi
5 changes: 0 additions & 5 deletions docs/source/stations/current.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/source/stations/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ List of weather station classes
:maxdepth: 2

average
current
mcdlocke
mcdlockearchive
mcdtelnet
Expand Down
Loading
Loading