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

Bring master up to date with dev #316

Merged
merged 21 commits into from
Sep 12, 2021
Merged

Bring master up to date with dev #316

merged 21 commits into from
Sep 12, 2021

Conversation

Mstrodl
Copy link
Member

@Mstrodl Mstrodl commented Sep 11, 2021

Seems to be mostly little housekeeping stuff, but I didn't look that hard :P

adamhb123 and others added 21 commits December 23, 2020 19:07
Converts the csh_ldap requirement from a git uri to the pypi package, along with semantic versioning requiring csh_ldap version >= 2.3.1

The requirement for csh_ldap version being >= 2.3.1 is based on soon-to-be-implemented healthchecking, which will be dependent on the changes made in this version.
Convert csh_ldap git uri to pypi in requirements.txt
migrate.py has tools for migrating from the old evals zookeeper
database. It's not been touched in a long time.

As a byproduct, fixes `import-outside-toplevel`
Upgrading to python 3.8, nodejs 10.x and fixing docker build
Updates the requirements on [click](https://github.com/pallets/click) to permit the latest version.
- [Release notes](https://github.com/pallets/click/releases)
- [Changelog](https://github.com/pallets/click/blob/master/CHANGES.rst)
- [Commits](pallets/click@6.7...7.1.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fix 500 on dashboard for non-upgraded accounts
@galenguyer galenguyer self-requested a review September 11, 2021 04:28
Copy link
Contributor

@mxmeinhold mxmeinhold left a comment

Choose a reason for hiding this comment

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

Please make sure this works in dev

@Mstrodl Mstrodl marked this pull request as draft September 11, 2021 13:21
@Mstrodl
Copy link
Member Author

Mstrodl commented Sep 11, 2021

Shit's fucked

@Mstrodl Mstrodl marked this pull request as ready for review September 11, 2021 14:07
@mxmeinhold
Copy link
Contributor

Shit's fucked

Does this mean that I should or should not approve this...?

@galenguyer
Copy link
Member

Mary is just dumb, shit isn't fucked

@mxmeinhold mxmeinhold merged commit 8a205f0 into master Sep 12, 2021
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.

5 participants