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

John/merge master to juniper upgrade #6

Conversation

johnbaldwin
Copy link

@johnbaldwin johnbaldwin commented Oct 26, 2020

This gets the juniper upgrade current with Figures 0.3.18 and addresses an issue with using packaging.version. Because not all Open edX deployments will have packaging installed, we're doing a quick hack to just check the major version of django_filters.version to provide compatibility between Ginkgo, Hawthorn, and Juniper.

This PR should also get all the tox environments running (we hope). We test against Python 2.7, 3.5, and 3.8

grozdanowski and others added 18 commits October 8, 2020 14:08
…rt-ui-feedback

Add success feedback to csv export dialog. John force merged because codecov is stuck
Django Filters < 1.0.0 requires 'lookup_type' instead of 'lookup_expr'
for CharField expression. This commit adds a `char_filter` method to
`figures.filters` to address this compatibility issue. The `char_filter`
function was copied and adapted from the `figures/filteres.py` update
from the JJuniper upgrade PR:

appsembler#264

IMPORTANT: We did not update `tests/test_filters.py` at this time in
order to save development time. We may revisit this decision
…ngo-filters

Ginkgo backward compatibility fix for Django Filters
Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](http-party/node-http-proxy@1.18.0...1.18.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matej Grozdanović <grozdanowski@gmail.com>
*  now use collected total user counts in
SiteDailyMetrics.total_user_count for the registered users
* This saves expensive database queries
* This is more accurate because it preserves historical data. The
previous approach captured live data for users for a site and users can
be removed from sites
* Very rudimentary test coverage added

What can be improved:

This does not report on users who have enrolled
for the current day. We want to avoide querying the Django 'User' model
for 'date_joined' because the field is not indexed

Test coverage can be improved. This commit just includes very basic
coverage
…-users-fix

Reworked SiteMonthlyMetrics registered users metric - Force merge because codecov is stuck pending...
Added a shim for Django Filter 0.11.0 call to MethodFilter

This addresses a compatibility issue where custom filter methods for Django Filter 1.x onward uses the following method signature:

`(self, queryset, name, value)`

Whereas Django Filter 0.11.0 uses the following method signature:

`(self, queryset, value)`

Primarily, we need to implement the shim because positional arguements instead of keyword arguments are used.
Fixed Ginkgo (Django Filter 0.11.0) Backward compatibility issue. Force merge because codecov is stuck.
packagine.versions is a very convenient way to compare package versions
for compatibility support. However, we cannot expect that the Open edX
deployment will have `packaging` installed.

This commit undos the dependency on `packaging` which was introduced
through backporting `django_filters` version checking to handle breaking
changes between the versions. Instead we added a crude version parsing
function into `figures.filters` and currently only use it for
`django_filters` which has the major, minor, and point versions in the
usual 'x.y.z' dot delimited numeric format. So this will work for Django
Filter but no guarantee for all packages.
…ng-dependency

HACK FIX - Removed dependency on 'packaging.versions'
Addressed conflict issue with figures/filters.py. Removed use of
`packaging` because it is not a given that an Open edX deployment will
have it installed
@BbrSofiane BbrSofiane merged commit e3207c0 into Dicey-Tech:juniper_upgrade Oct 27, 2020
@johnbaldwin johnbaldwin deleted the john/merge-master-to-juniper_upgrade branch October 28, 2020 10:16
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