Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update CI, python version and deps #405

Merged
merged 4 commits into from
Jan 30, 2025
Merged

update CI, python version and deps #405

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f71db9a
update CI, python version and deps
mattjperez Jan 29, 2025
f404c3c
fix env var name
mattjperez Jan 29, 2025
d008ac5
update deps versioning
mattjperez Jan 30, 2025
ce12052
Merge branch 'main' into update-ci-python-versions-deps
mattjperez Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.13'
- name: Run Python Canary
run: |
python -m pip install -r requirements.txt
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/canary_ota.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ on:
env:
ESP32_CANARY_ROBOT: ${{ secrets.ESP32_CANARY_ROBOT }}
ESP32_CANARY_ROBOT_PART_ID: ${{ secrets.ESP32_CANARY_ROBOT_PART_ID }}
ESP32_CANARY_API_KEY_2: ${{ secrets.ESP32_CANARY_API_KEY_2 }}
ESP32_CANARY_API_KEY_ID_2: ${{ secrets.ESP32_CANARY_API_KEY_ID_2 }}
ESP32_CANARY_API_KEY: ${{ secrets.ESP32_CANARY_API_KEY }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we no longer need KEY_*_2, please remember to remove them from the repository settings after this merges.

ESP32_CANARY_API_KEY_ID: ${{ secrets.ESP32_CANARY_API_KEY_ID }}
ESP32_OTA_BINARY_NAME: ${{ vars.ESP32_OTA_BINARY_NAME }}
GCP_BUCKET_URL: ${{ secrets.GCP_BUCKET_URL }}
GCP_BUCKET_NAME: ${{ secrets.GCP_BUCKET_NAME }}
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.13'
- name: Run Python Canary
run: |
python -m pip install -r requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/canary_summary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.13'
- name: Run Canary
run: |
python -m pip install -r requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions canary/canary_ota.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ async def connect(api_key: str, api_key_id: str, num_attempts: int) -> ViamClien
time.sleep(0.5)

async def main():
api_key = os.environ["ESP32_CANARY_API_KEY_2"]
api_key_id = os.environ["ESP32_CANARY_API_KEY_ID_2"]
api_key = os.environ["ESP32_CANARY_API_KEY"]
api_key_id = os.environ["ESP32_CANARY_API_KEY_ID"]
part_id = os.environ["ESP32_CANARY_ROBOT_PART_ID"]
tag_name = os.environ["ESP32_CANARY_OTA_VERSION_TAG"]
bucket_url = os.environ["GCP_BUCKET_URL"]
Expand Down
20 changes: 15 additions & 5 deletions canary/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
python-dateutil
viam-sdk
pymongo
numpy
slack-sdk
dnspython==2.7.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the better way to do this, rather than explicitly freezing including all transitive deps, is to set just the packages we directly rely on with "compatible" version markers. Given what is in this freeze result, I think that'd look like:

numpy ~= 2.2
pymongo ~= 4.11
python-dateutil ~= 2.2
slack-sdk ~= 3.34
viam-sdk ~= 0.38

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed

googleapis-common-protos==1.66.0
grpclib==0.4.7
h2==4.1.0
hpack==4.1.0
hyperframe==6.1.0
multidict==6.1.0
numpy==2.2.2
protobuf==5.29.1
pymongo==4.11
python-dateutil==2.9.0.post0
six==1.17.0
slack-sdk==3.34.0
typing-extensions==4.12.2
viam-sdk==0.38.0