Changes to make figures compatible with open edX Juniper #264

BbrSofiane · 2020-10-04T17:08:33Z

Implemented changes to make figures compatible with open edX Juniper.

The changes mostly revolve around Python 3 and Django 2 compatibility with some minor changes in open edX mocks behaviours. #241

Bump figures to 0.3.12

A couple of inline comments for code improvement

Merge before PR to push Juniper upgrade changes

Flake8 fixes to the Juniper upgrade work

johnbaldwin · 2020-10-06T17:06:10Z

Admin note: Before we merge this into Figures master, we should create a last 0.3.x release (0.3.17) IFF there are any other commits after this one: 27c20fb

If we don't have any more commits, then we don't need to because we can create a '0.3.x' branch from tag 0.3.16

BbrSofiane · 2020-10-12T08:39:03Z

@johnbaldwin sounds good, I'm waiting the PR.

* Added 'juniper.pytest' target in the Makefile * Added conditional imports so that it will work for Ginkgo, Hawthorn, and Juniper * Added conditional url pattern to address what looks like a namespace setting incompatibility between Django 1.8 and 2.x * PyLint fixes

* Ginkgo, Hawthorn community, Hawthorn multisite, Juniper community

Test fixes and tox update for Juniper upgrade

OmarIthawi

@BbrSofiane Thank you so much for the great work!

I have reviewed the work almost line-by-line and couldn't find anything pops up. So it should be good to merge. We'll need to deploy it to the Hawthorn staging so we check for regression issues.

I posted a some 13 comments. The majority are just minor ones that can be ignored or questions so I learn.

OmarIthawi · 2020-10-19T11:10:04Z

pytest-juniper.ini

@@ -0,0 +1,10 @@
+# This file supports PyTest testing Figures against Ginkgo mocks


Suggested change

# This file supports PyTest testing Figures against Ginkgo mocks

# This file supports PyTest testing Figures against Juniper mocks

OmarIthawi · 2020-10-19T11:11:37Z

mocks/juniper/course_modes/models.py

+
+
+
+class CourseMode(object):


Out of scope: It would be nice to have an automatic check if those mock actually exists in Juniper and the "signature" matches correctly.

devsite/devsite/seed.py

OmarIthawi · 2020-10-19T11:14:57Z

devsite/devsite/urls.py

    url(r'^accounts/', include('django.contrib.auth.urls')),
-    url(r'^figures/', include('figures.urls', namespace='figures')),
+    url(r'^figures/', include(('figures.urls', 'figures'), namespace='figures')),


Learning: What's the first argument (the tuple) means? in include(('figures.urls', 'figures')

OmarIthawi · 2020-10-19T11:17:25Z

figures/migrations/0003_pipelineerror.py

@@ -14,7 +15,7 @@ class Migration(migrations.Migration):
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
        ('figures', '0002_course_daily_metrics'),
    ]
-
+    # TODO Review on_delete behavious


tests/factories.py

tests/models/test_site_daily_metrics_model.py

OmarIthawi · 2020-10-19T11:25:39Z

mocks/juniper/openedx/core/djangoapps/content/course_overviews/models.py

@@ -53,7 +53,7 @@ class Meta(object):
        app_label = 'course_overviews'

    # IMPORTANT: Bump this whenever you modify this model and/or add a migration.
-    VERSION = 6
+    VERSION = 11  # this one goes to eleven


OmarIthawi · 2020-10-19T11:28:25Z

devsite/devsite/test_settings.py

@@ -29,7 +29,7 @@ def root(*args):

 sys.path.append(root('mocks', MOCKS_DIR))

-
+print(OPENEDX_RELEASE)


Suggested change

print(OPENEDX_RELEASE)

OmarIthawi · 2020-10-19T11:29:17Z

devsite/devsite/cans/student_modules.py

+try:
+    from lms.djangoapps.courseware.models import StudentModule
+except ImportError:
+    # Backward compatibily for pre-Juniper releases
+    from courseware.models import StudentModule


Minor: Good use for the compat.py module.

Co-authored-by: Omar Al-Ithawi <i@omardo.com>

BbrSofiane · 2020-10-20T09:07:17Z

@OmarIthawi Thanks for the review!
I've gone through an committed the suggestions that you made.

BbrSofiane · 2020-10-20T09:09:16Z

@johnbaldwin Should I look into the conflicts?

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

…pgrade John/merge master to juniper upgrade

Add Juniper Tox environments to TravisCI file

Fix flake8 issue of duplicate function in figures.filters

Remarked out Pytest cov calls to troubleshoot travis-ci

Reworking TravisCI config to conditionally run Tox environemnts

Yet another try at guessing what travis will do

file

Update Tox to Fix Juniper 'mock 3.0.5' version support, clean up travis file

…upgrade-2 Merge Appsembler master changes to 0.3.19

BbrSofiane and others added 26 commits July 16, 2020 08:59

Merge pull request #1 from appsembler/master

819c6a5

Bump figures to 0.3.12

Merge pull request #2 from appsembler/master

b944b8f

A couple of inline comments for code improvement

add juniper_community.txt

70fcb9b

create pytest-juniper.ini

02a5d5c

add juniper mocks

aab427e

upgrade mocks course_modes and courseware

392694f

run python-modernize and devsite

965dc91

update devsite/test_settings to run pytest

fb4235d

fix test_compat.py test failures

8230c37

update juniper mocks

b6becda

fix test_course_daily_metrics_view

0202d3b

fix test_courses_index_view

a231922

fix test_ course_enrollment/learner_details views

cdf072f

fix test_general_course_data_view

eaf2eb4

fix test_site_daily_metrics_view

f487608

backward compitibility fix for BooleanFilters

23967e1

backward compatibility fix for date ranges tests

ca869c6

Fix import path for StudentModule

0cbd96d

Add backward compatibility to StudentModule import

bcef0cc

move backward compatibility for StudenModule

9853806

handle xmodule_django field deprecations

6c5c95c

add changes to compat.py

f9a389d

add juniper environment to tox.ini

d1b6069

Merge pull request #3 from appsembler/master

b3df88f

Merge before PR to push Juniper upgrade changes

🔀 merge 0.3.16

360289b

♻️ refactor settings to use django-environ

33d050a

BbrSofiane changed the title ~~Changes to make figures compatible with open edXJ/uniper upgrade~~ Changes to make figures compatible with open edX Juniper Oct 4, 2020

johnbaldwin and others added 2 commits October 6, 2020 18:51

Flake8 fixes to the Juniper upgrade work

96d6742

Merge pull request #4 from johnbaldwin/john/juniper_upgrade-flake8-fixes

fac379b

Flake8 fixes to the Juniper upgrade work

johnbaldwin and others added 3 commits October 13, 2020 11:20

Updated tox to work with all supported environments

a80d867

* Ginkgo, Hawthorn community, Hawthorn multisite, Juniper community

Merge pull request #5 from johnbaldwin/john/juniper_upgrade-test-fixes

7b4c936

Test fixes and tox update for Juniper upgrade

OmarIthawi approved these changes Oct 19, 2020

View reviewed changes

BbrSofiane and others added 5 commits October 20, 2020 09:46

Update devsite/devsite/seed.py

41e615d

Co-authored-by: Omar Al-Ithawi <i@omardo.com>

Update tests/factories.py

e7e0819

Co-authored-by: Omar Al-Ithawi <i@omardo.com>

Update tests/models/test_site_daily_metrics_model.py

d98a844

Co-authored-by: Omar Al-Ithawi <i@omardo.com>

Update tests/factories.py

ddaa16b

Co-authored-by: Omar Al-Ithawi <i@omardo.com>

Update tests/factories.py

2fa50fe

Co-authored-by: Omar Al-Ithawi <i@omardo.com>

johnbaldwin and others added 17 commits October 26, 2020 22:33

Merge branch 'master' into john/merge-master-to-juniper_upgrade

1b549c7

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

Merge pull request #6 from johnbaldwin/john/merge-master-to-juniper_u…

e3207c0

…pgrade John/merge master to juniper upgrade

Add Juniper Tox environments to TravisCI file

8ad2c6f

Merge pull request #7 from johnbaldwin/johh/add-juniper-to-travis

8551fd6

Add Juniper Tox environments to TravisCI file

Fix flake8 issue of duplicate function in figures.filters

e2fee9b

Merge pull request #8 from johnbaldwin/john/fix-flake8

df9b4be

Fix flake8 issue of duplicate function in figures.filters

Remarked out Pytest cov calls to troubleshoot travis-ci

d75b296

Merge pull request #9 from johnbaldwin/john/troubleshoot-travis

867aaba

Remarked out Pytest cov calls to troubleshoot travis-ci

Reworking TravisCI config to conditionally run Tox environemnts

6fc8008

Merge pull request #10 from johnbaldwin/john/rework-travis-ci

b3416f8

Reworking TravisCI config to conditionally run Tox environemnts

Yet antother try at guessing what travis will do

156cc1a

Tox: skip missing interpreters

444c3a1

Merge pull request #11 from johnbaldwin/john/rework-travis-ci

ed421e4

Yet another try at guessing what travis will do

Update Tox to Fix Juniper 'mock 3.0.5' version support, clean up travis

062dc98

file

Merge pull request #12 from johnbaldwin/john/fix-tox-py35

290445e

Update Tox to Fix Juniper 'mock 3.0.5' version support, clean up travis file

Merge branch 'master' into john/merge-master-to-juniper_upgrade

fba2623

Merge pull request #13 from johnbaldwin/john/merge-master-to-juniper_…

ba4edb6

…upgrade-2 Merge Appsembler master changes to 0.3.19

johnbaldwin merged commit 019e60c into appsembler:master Nov 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes to make figures compatible with open edX Juniper #264

Changes to make figures compatible with open edX Juniper #264

BbrSofiane commented Oct 4, 2020 •

edited

Loading

johnbaldwin commented Oct 6, 2020 •

edited

Loading

BbrSofiane commented Oct 12, 2020

OmarIthawi left a comment

OmarIthawi Oct 19, 2020

OmarIthawi Oct 19, 2020

OmarIthawi Oct 19, 2020

OmarIthawi Oct 19, 2020

OmarIthawi Oct 19, 2020

OmarIthawi Oct 19, 2020

OmarIthawi Oct 19, 2020

BbrSofiane commented Oct 20, 2020

BbrSofiane commented Oct 20, 2020

		@@ -0,0 +1,10 @@
		# This file supports PyTest testing Figures against Ginkgo mocks

		@@ -29,7 +29,7 @@ def root(*args):

		sys.path.append(root('mocks', MOCKS_DIR))


		print(OPENEDX_RELEASE)

Changes to make figures compatible with open edX Juniper #264

Changes to make figures compatible with open edX Juniper #264

Conversation

BbrSofiane commented Oct 4, 2020 • edited Loading

johnbaldwin commented Oct 6, 2020 • edited Loading

BbrSofiane commented Oct 12, 2020

OmarIthawi left a comment

Choose a reason for hiding this comment

OmarIthawi Oct 19, 2020

Choose a reason for hiding this comment

OmarIthawi Oct 19, 2020

Choose a reason for hiding this comment

OmarIthawi Oct 19, 2020

Choose a reason for hiding this comment

OmarIthawi Oct 19, 2020

Choose a reason for hiding this comment

OmarIthawi Oct 19, 2020

Choose a reason for hiding this comment

OmarIthawi Oct 19, 2020

Choose a reason for hiding this comment

OmarIthawi Oct 19, 2020

Choose a reason for hiding this comment

BbrSofiane commented Oct 20, 2020

BbrSofiane commented Oct 20, 2020

BbrSofiane commented Oct 4, 2020 •

edited

Loading

johnbaldwin commented Oct 6, 2020 •

edited

Loading