Skip to content

Commit

Permalink
Merge branch 'develop' into feature/#106-Gaussian-Smoothing
Browse files Browse the repository at this point in the history
  • Loading branch information
dh1542 committed Jan 28, 2025
2 parents 08faaf1 + 25781ea commit 7feec7d
Show file tree
Hide file tree
Showing 13 changed files with 906 additions and 215 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
matrix:
os: [ubuntu-latest]
python-version: ["3.9", "3.10", "3.11", "3.12"]
pyspark: ["3.3.0", "3.3.1", "3.3.2", "3.4.0", "3.4.1", "3.5.0", "3.5.1"]
pyspark: ["3.3.0", "3.3.1", "3.3.2", "3.4.0", "3.4.1", "3.5.0", "3.5.1"] # 3.5.2 does not work with conda
exclude:
- pyspark: "3.5.1"
python-version: "3.9"
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ channels:
dependencies:
- python>=3.9,<3.13
- importlib-metadata>=7.0.0
- jinja2>=3.1.4
- jinja2>=3.1.5
- pytest==7.4.0
- pytest-mock==3.11.1
- pytest-cov==4.1.0
Expand All @@ -36,7 +36,7 @@ dependencies:
- azure-mgmt-storage>=21.0.0
- boto3>=1.28.2,<2.0.0
- pyodbc>=4.0.39,<5.3.0
- fastapi>=0.110.0,<1.0.0
- fastapi>=0.115.6,<1.0.0
- httpx>=0.24.1,<1.0.0
- pyspark>=3.3.0,<3.6.0
- delta-spark>=2.2.0,<3.3.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"pyarrow>=14.0.1,<17.0.0",
"azure-identity>=1.12.0,<2.0.0",
"pandas>=1.5.2,<2.2.0",
"jinja2>=3.1.2,<4.0.0",
"jinja2>=3.1.5,<4.0.0",
"importlib_metadata>=7.0.0,<8.0.0",
"semver>=3.0.0,<4.0.0",
"xlrd>=2.0.1,<3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Do not include azure-functions-worker as it may conflict with the Azure Functions platform
azure-functions==1.18.0
fastapi==0.110.0
fastapi==0.115.6
pydantic==2.6.0
# turbodbc==4.11.0
pyodbc==4.0.39
Expand All @@ -10,7 +10,7 @@ azure-identity==1.17.0
oauthlib>=3.2.2
pandas>=2.0.1,<3.0.0
numpy==1.26.4
jinja2==3.1.4
jinja2==3.1.5
pytz==2024.1
semver==3.0.2
xlrd==2.0.1
Expand Down
Loading

0 comments on commit 7feec7d

Please sign in to comment.