fix: test/ci environment fixes (#1170)

* feat: remove libsass pin * fix: tox/travis env match python/django versions
openedx-unsupported · Aug 31, 2021 · 8399d7f · 8399d7f
1 parent e128dde
commit 8399d7f
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,8 @@ install:
 script:
     - docker exec -t -e TRAVIS=1 insights_testing bash -c "
       cd /edx/app/insights/edx_analytics_dashboard/ &&
-      PATH=\$PATH:/edx/app/insights/nodeenvs/insights/bin:/snap/bin &&
+      source /edx/app/insights/insights_env &&
+      PATH=\$PATH:/snap/bin &&
       make $TARGETS "
 
 matrix:

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ ROOT = $(shell echo "$$PWD")
 COVERAGE_DIR = $(ROOT)/build/coverage
 NODE_BIN=./node_modules/.bin
 PYTHON_ENV=py38
-DJANGO_VERSION=django22
+DJANGO_VERSION=django32
 
 DJANGO_SETTINGS_MODULE ?= "analytics_dashboard.settings.local"
 

diff --git a/requirements/base.in b/requirements/base.in
@@ -27,7 +27,7 @@ edx-analytics-data-api-client
 edx-i18n-tools
 edx-rest-api-client						# Apache
 edx-toggles
-libsass==0.11.1							# MIT
+libsass								# MIT
 logutils        						# BSD
 requests								# Apache 2.0
 stevedore

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -131,7 +131,7 @@ idna==3.2
     # via requests
 jinja2==3.0.1
     # via code-annotations
-libsass==0.11.1
+libsass==0.21.0
     # via -r requirements/base.in
 logutils==0.3.5
     # via -r requirements/base.in
@@ -189,7 +189,7 @@ pyyaml==5.4.1
     #   code-annotations
     #   edx-django-release-util
     #   edx-i18n-tools
-regex==2021.8.21
+regex==2021.8.28
     # via awesome-slugify
 requests==2.26.0
     # via

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -173,7 +173,7 @@ jinja2==3.0.1
     #   -r requirements/base.txt
     #   code-annotations
     #   sphinx
-libsass==0.11.1
+libsass==0.21.0
     # via -r requirements/base.txt
 logutils==0.3.5
     # via -r requirements/base.txt
@@ -271,7 +271,7 @@ pyyaml==5.4.1
     #   code-annotations
     #   edx-django-release-util
     #   edx-i18n-tools
-regex==2021.8.21
+regex==2021.8.28
     # via
     #   -r requirements/base.txt
     #   awesome-slugify

diff --git a/requirements/local.txt b/requirements/local.txt
@@ -201,7 +201,7 @@ lazy-object-proxy==1.4.3
     # via
     #   -r requirements/test.txt
     #   astroid
-libsass==0.11.1
+libsass==0.21.0
     # via -r requirements/test.txt
 logutils==0.3.5
     # via -r requirements/test.txt
@@ -340,7 +340,7 @@ pyyaml==5.4.1
     #   code-annotations
     #   edx-django-release-util
     #   edx-i18n-tools
-regex==2021.8.21
+regex==2021.8.28
     # via
     #   -r requirements/test.txt
     #   awesome-slugify

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -164,7 +164,7 @@ jinja2==3.0.1
     # via
     #   -r requirements/base.txt
     #   code-annotations
-libsass==0.11.1
+libsass==0.21.0
     # via -r requirements/base.txt
 logutils==0.3.5
     # via -r requirements/base.txt
@@ -263,7 +263,7 @@ pyyaml==5.4.1
     #   code-annotations
     #   edx-django-release-util
     #   edx-i18n-tools
-regex==2021.8.21
+regex==2021.8.28
     # via
     #   -r requirements/base.txt
     #   awesome-slugify

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -187,7 +187,7 @@ lazy==1.4
     # via bok-choy
 lazy-object-proxy==1.4.3
     # via astroid
-libsass==0.11.1
+libsass==0.21.0
     # via -r requirements/base.txt
 logutils==0.3.5
     # via -r requirements/base.txt
@@ -308,7 +308,7 @@ pyyaml==5.4.1
     #   code-annotations
     #   edx-django-release-util
     #   edx-i18n-tools
-regex==2021.8.21
+regex==2021.8.28
     # via
     #   -r requirements/base.txt
     #   awesome-slugify

diff --git a/requirements/tox.txt b/requirements/tox.txt
@@ -1,19 +1,21 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    make upgrade
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.0
     # via virtualenv
 distlib==0.3.2
     # via virtualenv
 filelock==3.0.12
     # via
     #   tox
     #   virtualenv
-packaging==20.9
+packaging==21.0
     # via tox
+platformdirs==2.3.0
+    # via virtualenv
 pluggy==0.13.1
     # via tox
 py==1.10.0
@@ -26,12 +28,12 @@ six==1.16.0
     #   virtualenv
 toml==0.10.2
     # via tox
-tox-battery==0.6.1
-    # via -r requirements/tox.in
 tox==3.14.6
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/tox.in
     #   tox-battery
-virtualenv==20.4.7
+tox-battery==0.6.1
+    # via -r requirements/tox.in
+virtualenv==20.7.2
     # via tox
diff --git a/requirements/travis.txt b/requirements/travis.txt
@@ -10,9 +10,9 @@ backports.entry-points-selectable==1.1.0
     #   virtualenv
 certifi==2021.5.30
     # via requests
-charset-normalizer==2.0.3
+charset-normalizer==2.0.4
     # via requests
-codecov==2.1.11
+codecov==2.1.12
     # via -r requirements/travis.in
 coverage==5.5
     # via codecov
@@ -31,7 +31,7 @@ packaging==21.0
     # via
     #   -r requirements/tox.txt
     #   tox
-platformdirs==2.2.0
+platformdirs==2.3.0
     # via
     #   -r requirements/tox.txt
     #   virtualenv
@@ -67,7 +67,7 @@ tox-battery==0.6.1
     # via -r requirements/tox.txt
 urllib3==1.26.6
     # via requests
-virtualenv==20.6.0
+virtualenv==20.7.2
     # via
     #   -r requirements/tox.txt
     #   tox
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist = True
-envlist = py38-django{22,30,31}-{a11y,accept,check_isort,create_acceptance_test_soapbox_messages,delete_acceptance_test_soapbox_messages,detect_changed_translations,dummy_translations,extract_translations,pycodestyle,pylint,tests,validate_translations,waffle_learner_analytics,waffle_course_filters,waffle_course_passing}
+envlist = py38-django{22,30,31,32}-{a11y,accept,check_isort,create_acceptance_test_soapbox_messages,delete_acceptance_test_soapbox_messages,detect_changed_translations,dummy_translations,extract_translations,pycodestyle,pylint,tests,validate_translations,waffle_learner_analytics,waffle_course_filters,waffle_course_passing}
 
 [pytest]
 DJANGO_SETTINGS_MODULE = analytics_dashboard.settings.test
@@ -34,6 +34,7 @@ deps =
 	django22: Django>=2.2,<2.3
 	django30: Django>=3.0,<3.1
 	django31: Django>=3.1,<3.2
+	django32: -r requirements/django.txt
 	-r {toxinidir}/requirements/test.txt
 changedir =
 	detect_changed_translations,dummy_translations,validate_translations: analytics_dashboard