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

FLEX-106: 🔀 Merge v2.20.1 into OPEN's customized version of SEED #21

Closed
wants to merge 206 commits into from

Conversation

justindbelanger
Copy link

@justindbelanger justindbelanger commented Nov 8, 2023

Any background context you want to provide?

The upstream SEED repo is now several released versions ahead of our (OPEN's) forked version.

What's this PR do?

This PR pulls in the newest changes from the upstream SEED repo's develop branch into our opengb-develop branch.

This PR should result in us benefiting from the newest changes from the upstream SEED repo, but also maintaining our own customizations (mostly related to outbound emails to users).

How should this be manually tested?

TBD

What are the relevant tickets?

FLEX-106

Screenshots (if appropriate)

N/A

nllong and others added 30 commits December 19, 2022 11:05
Co-authored-by: Alex Chapin <[email protected]>
Co-authored-by: Alex Chapin <[email protected]>
…n-nulls-and-empty-strings

Fix filter on nulls and empty strings
* Fix custom report legend sort for chrome

* Removed the console log statement

Co-authored-by: Alex Chapin <[email protected]>
Co-authored-by: Alex Chapin <[email protected]>
…nd prevent duplicate column names (SEED-platform#3728)

* update derived column migration to create unique names for derived columns

* prevent derived column names that are duplicated with column names

* disable create/save on error

* update and add test
…D-platform#3745)

* Fix custom report legend sort for chrome

* Removed the console log statement

* Removed startswith method and instead stripped
units off end of field string and checked equal
to header_string

* Fixed the failing tests

* Remove all extra spaces in headers from XLSX files (SEED-platform#3747)

use strip in MCM parser for XLSX headers

* Revise code to make it work more generically and
added a new test for new format of ESPM data

Co-authored-by: Hannah Eslinger <[email protected]>
Co-authored-by: Alex Chapin <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
* Fix filter None not empty string on non strings

* Apease mypy

* Make is_null_filter_value bools (?????)

* - isnull filtering related to (non-)empty strings now correctly uses booleans
- querying extra_data keys no longer removes all double-quotes from the data
- querying extra_data keys now correctly matches non-existent keys, null values, and empty strings when filtering for empty values (`=""`), and similarly can match all non-empty values
- test_search fixes

* - Fixed numeric comparisons where filter input had decimals
- Fixed empty string filtering on columns with no data type (assumes text filtering)
- Fixed `>` and `>=` bugs when deleting filters
- Fixed parsing extra_data numeric fields with comma separators in the raw values
- Fixed front-end bug that would hide all grid data in numeric columns that couldn't explicitly be parsed as a number

* Test fixes

Co-authored-by: Alex Chapin <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Alex Swindler <[email protected]>
…t data types (SEED-platform#3789)

* move cast method from search to column object for reuse

* year_ending is a date field, not datetime

* remove placeholder f-string

* add unit tests for converting strings with commas for thousand separators
Bumps [future](https://github.com/PythonCharmers/python-future) from 0.18.2 to 0.18.3.
- [Release notes](https://github.com/PythonCharmers/python-future/releases)
- [Changelog](https://github.com/PythonCharmers/python-future/blob/master/docs/changelog.rst)
- [Commits](PythonCharmers/python-future@v0.18.2...v0.18.3)

---
updated-dependencies:
- dependency-name: future
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* bump version

* update changelog
* Remove state population in creat column

* Fix Tests

---------

Co-authored-by: Alex Swindler <[email protected]>
anchapin and others added 17 commits October 19, 2023 20:54
* Increase max timeout to ~3minutes

* Switched time.sleep back to 2
* force ssl for elasticache.

* fix bug with celery broker connect string for Elastichache redis.

* fix syntax error.

* force ssl.

* make more docker config settings appropriate for prod.

* fix django debug_level

* change defaults back to false to not break existing tests.

* take out quotes for false.

---------

Co-authored-by: Damon Haley <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
* list of better measures were out of date

* Fixed alphabetization

---------

Co-authored-by: Alex Swindler <[email protected]>
…atform#4282)

* eeej small files

* fail gracefully if at export credentials are invalid

* update tests for return values

* move dev var to override

* styles

* add env var for faster migrations

* send at credentials as form-data to allow escape characters(%)

---------

Co-authored-by: Nicholas Long <[email protected]>
add analysis description translations

Co-authored-by: Nicholas Long <[email protected]>
Added `/api/health_check/` endpoint
…oyments (SEED-platform#4377)

* disable wait-for-it in Stratus - managed services are always running.

* change var STRATUS_MANAGED_SERVICES_ENABLED to DISABLE_SERVICE_CHECKS_ON_START

---------

Co-authored-by: Damon Haley <[email protected]>
Bumps [django](https://github.com/django/django) from 3.2.20 to 3.2.23.
- [Commits](django/django@3.2.20...3.2.23)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nicholas Long <[email protected]>
@justindbelanger justindbelanger marked this pull request as ready for review November 10, 2023 20:20
@justindbelanger justindbelanger changed the title FLEX-106: 🔀 Merge newest changes from upstream SEED repo FLEX-106: 🔀 Merge v2.20.1 into OPEN's customized version of SEED Nov 10, 2023
@justindbelanger
Copy link
Author

I've just realized that v2.20.0 and newer don't include the old v2 SEED APIs, which we absolutely require in order for the SEED to GRID import to function. so... we can't upgrade to v2.20.0 or newer without making code changes to that import.

See https://github.com/SEED-platform/seed/releases/tag/v2.20.0 for the changelog, including the notice about removal of old SEED APIs.

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

Successfully merging this pull request may close these issues.

9 participants