Skip to content

Commit

Permalink
Merge branch 'main' into eslint-spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
devinmatte authored Dec 17, 2023
2 parents c9f19bc + 2a07bcb commit 7608f47
Show file tree
Hide file tree
Showing 7 changed files with 972 additions and 140 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
node-version: ['18', '20']
python-version: ['3.10']
python-version: ['3.11']
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
node-version: ['18']
python-version: ['3.10']
python-version: ['3.11']
env:
AWS_PROFILE: transitmatters
AWS_DEFAULT_REGION: us-east-1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
node-version: ['18']
python-version: ['3.10']
python-version: ['3.11']
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand All @@ -38,7 +38,7 @@ jobs:
strategy:
matrix:
node-version: ['18']
python-version: ['3.10']
python-version: ['3.11']
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10.11
3.11.6
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This is the repository for the TransitMatters Data Dashboard. Client code is wri
- node 18.x and npm 9.x required
- With `nvm` installed, use `nvm install && nvm use`
- verify with `node -v`
- Python 3.10 with recent poetry (1.5.0 or later)
- Python 3.11 with recent poetry (1.6.0 or later)
- Verify with `python --version && poetry --version`
- `poetry self update` to update poetry

Expand Down
1,081 changes: 956 additions & 125 deletions server/poetry.lock

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,29 @@ authors = ["TransitMatters Labs Team"]
license = "MIT"

[tool.poetry.dependencies]
python = "~3.10"
python = "~3.11"
json-api-doc = "0.15.0"
requests = "2.31.0"
pytz = "2023.3"
boto3 = "1.26.153"
botocore = "1.29.153"
numpy = "1.24.3"
boto3 = "1.34.2"
botocore = "1.34.2"
numpy = "1.26.2"
pandas = "1.5.3"
datadog_lambda = "5.85.0"
ddtrace = "2.3.1"
dynamodb-json = "^1.3"

[tool.poetry.dev-dependencies]
pip = ">=23.0"
chalice = "1.29.0"
flake8 = "~6.0.0"
black = "~23.7.0"
chalice = "1.30.0"
flake8 = "~6.1.0"
black = "~23.12.0"
poetry-plugin-export = "^1.6.0"

[tool.black]
line-length = 120
target-version = ['py310']
target-version = ['py311']

[build-system]
requires = ["poetry-core>=1.5.0"]
requires = ["poetry-core>=1.6.0"]
build-backend = "poetry.core.masonry.api"

0 comments on commit 7608f47

Please sign in to comment.