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.

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 for current release of desktop server #4135

Merged
merged 10 commits into from
Jan 23, 2023

Conversation

fperez
Copy link
Collaborator

@fperez fperez commented Jan 20, 2023

As per @yuvipanda's input.

@fperez
Copy link
Collaborator Author

fperez commented Jan 20, 2023

BTW, this is not urgent at all - yesterday's big update was all we needed for now, and this is more of a cleanup so we're up to date with the current tools.

@shaneknapp
Copy link
Contributor

@fperez also curious if we should update infra-requirements.txt to match https://github.com/fperez/stat159-image/blob/main/infra-requirements.txt

@fperez
Copy link
Collaborator Author

fperez commented Jan 20, 2023

No, we actually don't need that file at all - I'm cleaning up that other repo just now, hang tight :)

@shaneknapp
Copy link
Contributor

No, we actually don't need that file at all - I'm cleaning up that other repo just now, hang tight :)

word. :)

@fperez
Copy link
Collaborator Author

fperez commented Jan 20, 2023

All set @shaneknapp! Sorry for the slight delay, had a weird issue with getting the env to build locally (I double check that it works :) and it took a bit to sort out. All set!

@shaneknapp
Copy link
Contributor

hey @fperez there are a few conflicts, so please take a look and let me know when they're done!

@fperez
Copy link
Collaborator Author

fperez commented Jan 21, 2023

All conflicts fixed - they happened b/c folks were working on the files for this hub instead of a separate d100 one - in the future please LMK if you intend to work on these files so we can coordinate to avoid conflicts. I figured I'd be updating this folder alone :)

@shaneknapp
Copy link
Contributor

All conflicts fixed - they happened b/c folks were working on the files for this hub instead of a separate d100 one - in the future please LMK if you intend to work on these files so we can coordinate to avoid conflicts. I figured I'd be updating this folder alone :)

the conflicts happened as we were trying to get data100 unblocked w/otter-grader.

since we now have a separate data100 image, you'll be the only one (hopefully!) hacking on this folder moving forward. :)

@fperez
Copy link
Collaborator Author

fperez commented Jan 23, 2023

Yup! This looks good to merge - I start teaching tomorrow, so if you have a chance to merge it, I'd appreciate it!

@shaneknapp shaneknapp marked this pull request as draft January 23, 2023 03:05
@shaneknapp shaneknapp marked this pull request as ready for review January 23, 2023 03:06
@shaneknapp shaneknapp merged commit 6dcd7fa into berkeley-dsep-infra:staging Jan 23, 2023
@fperez
Copy link
Collaborator Author

fperez commented Jan 23, 2023

Great, thanks!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants