Merge pull request #266 from CenterForTheBuiltEnvironment/development

filtering data grays out part of the chart

Author: FedericoTartarini

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.0
+current_version = 0.10.1
 commit = True
 tag = True
 

.dockerignore

@@ -2,8 +2,6 @@ README.md
 LICENSE
 Procfile
 Procfile.windows
-Pipfile.lock
-Pipfile
 *.pyo
 *.pyd
 __pycache__

.github/workflows/cypress.yml

@@ -31,6 +31,19 @@ jobs:
         run: |-
           pipenv run ruff format --check .
 
+      - name: Install Playwright Browsers
+        run: |
+          pipenv run playwright install chromium
+
+      - name: Start Clima
+        run: |-
+          pipenv run python main.py &
+      
+      - name: Wait for Clima to be ready
+        run: |
+          timeout 60 bash -c 'until curl -f http://127.0.0.1:8080; do sleep 1; done'
+
       - name: Test Clima
         run: |-
-          pipenv run python -m pytest
+          cd tests
+          pipenv run pytest --base-url=http://127.0.0.1:8080 -vv

.github/workflows/python.yml

@@ -2,19 +2,28 @@
 # https://hub.docker.com/_/python
 FROM python:3.11-slim
 
+# Allow statements and log messages to immediately appear in the Knative logs
+ENV PYTHONUNBUFFERED=True
+
 RUN apt-get update \
-&& apt-get install gcc -y \
-&& apt-get clean
+    && apt-get install --no-install-recommends -y gcc \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install pipenv
+RUN python -m pip install --upgrade pip \
+    && python -m pip install --no-cache-dir "pipenv>=2024.0,<2026.0"
+# Set working directory
+WORKDIR /app
 
-ENV APP_HOME /app
-WORKDIR $APP_HOME
+# Copy Pipfile and Pipfile.lock
+COPY Pipfile Pipfile.lock ./
 
-COPY . ./
+# Install dependencies
+RUN pipenv sync
 
-# Install production dependencies.
-RUN pip install --upgrade pip
-RUN pip install -r requirements.txt
+COPY . .
 
 EXPOSE 8080
 
-CMD python main.py
+CMD ["pipenv", "run", "python", "main.py"]

Dockerfile

@@ -4,12 +4,12 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-dash = "==2.15"
+dash = "==3.2"
 pvlib = "==0.9.1"
 pythermalcomfort = "==2.9.1"
 dash-bootstrap-components = "==1.2.0"
 dash-extensions = "==1.0.7"
-dash-mantine-components = "==0.12.1"
+dash-mantine-components = "==2.2.1"
 requests = "==2.32.4"
 plotly = "==5.18.0"
 pandas = "==2.2.0"
@@ -24,6 +24,8 @@ bump2version = "*"
 black = "*"
 ruff = "*"
 pre-commit = "*"
+pytest-playwright = "*"
+pytest-xdist = "*"
 
 [requires]
 python_version = "3.11"