Skip to content

Commit

Permalink
Merge pull request #256 from NASA-IMPACT/mcp
Browse files Browse the repository at this point in the history
Bump Node, CDK versions
  • Loading branch information
chuckwondo authored Oct 19, 2023
2 parents 266ac66 + 4722773 commit 25714b0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/mcp_dev_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Run Tox test environment
# Run tox using the version of Python in `PATH`
run: tox -e py
dev-deployment:
mcp-dev-deployment:
strategy:
matrix:
python: [3.8]
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
jq -r <<<"$VARS_JSON" 'to_entries|map("\(.key)=\(.value)\u0000")[]'
)
- name: Deploy with tox
run: tox -e dev -r -- deploy --require-approval never
run: tox -v -e dev -r -- deploy --require-approval never
- name: Run DB setup
run: |
setupdb=$(aws cloudformation describe-stacks \
Expand Down
9 changes: 3 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
"""Setup for hls-orchestration"""
import os
import subprocess
import sys


from setuptools import find_packages, setup

# Runtime requirements.
aws_cdk_version = "1.65.0"
aws_cdk_version = "1.203.0"
aws_cdk_reqs = [
"core",
"aws-s3",
Expand All @@ -31,10 +29,9 @@

inst_reqs = [
"boto3",
*[f"aws_cdk.{x}=={aws_cdk_version}" for x in aws_cdk_reqs],
]

inst_reqs.append([f"aws_cdk.{x}=={aws_cdk_version}" for x in aws_cdk_reqs])

extra_reqs = {
"test": [
"pytest",
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ passenv =
HLS_*
AWS_*
commands =
nodeenv --node=15.4.0 -p
npm install -g aws-cdk@1.65.0
nodeenv --node=16.20.2 -p
npm install -g aws-cdk@1.203.0
cdk --version

[testenv:dev]
Expand Down

0 comments on commit 25714b0

Please sign in to comment.