Skip to content

Commit

Permalink
Merge pull request #126 from Michele-Alberti/development
Browse files Browse the repository at this point in the history
🐛 Fix error in stats table query
  • Loading branch information
Michele-Alberti authored Feb 28, 2024
2 parents c690fd1 + 7c9cd11 commit 437a68b
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump_version.yaml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
- name: Bump and changelog
id: cz
uses: commitizen-tools/commitizen-action@0.16.1
uses: commitizen-tools/commitizen-action@0.20.0
with:
github_token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
prerelease: "${{ steps.vars.outputs.pre_release }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
name: python-package-distributions
path: dist/
- name: Sign the dists with Sigstore
uses: sigstore/gh-action-sigstore-python@v1.2.3
uses: sigstore/gh-action-sigstore-python@v2.1.1
with:
inputs: >-
./dist/*.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions dlunch/conf/db/postgresql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ orders_query: |-
ON m.id = o.menu_item_id;
# Stats
stats_query: |-
SELECT EXTRACT(YEAR FROM date) AS "Year",
EXTRACT(MONTH FROM date) AS "Month",
SELECT EXTRACT(YEAR FROM date)::varchar(4) AS "Year",
EXTRACT(MONTH FROM date)::varchar(2) AS "Month",
guest AS "Guest",
SUM(hungry_people) AS "Hungry People"
FROM {schema}.stats
Expand Down
26 changes: 13 additions & 13 deletions requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ channels:
- pyviz
dependencies:
- python=3.11.7
- setuptools=67.8.0
- click=8.0.4
- cryptography=42.0.4
- ipykernel=6.19.2
- ipywidgets=8.0.4
- openpyxl=3.0.10
- pandas=2.1.4
- setuptools=69.1.1
- click=8.1.7
- cryptography=42.0.5
- ipykernel=6.29.2
- ipywidgets=8.1.2
- openpyxl=3.1.2
- pandas=2.2.1
- passlib=1.7.4
- tenacity=8.2.2
- tqdm=4.65.0
- panel=1.3.6
- sqlalchemy=2.0.23
- psycopg=3.1.16
- tenacity=8.2.3
- tqdm=4.66.2
- panel=1.3.8
- sqlalchemy=2.0.27
- psycopg=3.1.18
- sqlite=3.41.2
- hydra-core=1.3.2
- google-cloud-storage=2.6.0
- google-cloud-storage=2.14.0
- pytesseract=0.3.10
26 changes: 13 additions & 13 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
setuptools==67.8.0
click==8.0.4
cryptography==42.0.4
ipykernel==6.19.2
ipywidgets==8.0.4
openpyxl==3.0.10
pandas==2.1.4
setuptools==69.1.1
click==8.1.7
cryptography==42.0.5
ipykernel==6.29.2
ipywidgets==8.1.2
openpyxl==3.1.2
pandas==2.2.1
passlib==1.7.4
tenacity==8.2.2
tqdm==4.65.0
panel==1.3.6
sqlalchemy==2.0.23
psycopg==3.1.16
tenacity==8.2.3
tqdm==4.66.2
panel==1.3.8
sqlalchemy==2.0.27
psycopg==3.1.18
hydra-core==1.3.2
google-cloud-storage==2.6.0
google-cloud-storage==2.14.0
pytesseract==0.3.10

0 comments on commit 437a68b

Please sign in to comment.