Develop koa

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-dist: latest
+dist: focal
 
 branches:
   only:
@@ -27,7 +27,7 @@ before_install:
 install:
   - docker exec -t ecommerce_testing bash -c "
       cd /edx/app/ecommerce/ecommerce/ &&
-      pip install tox
+      python3 -m pip install tox
     "
 script:
   - docker exec -t -e TRAVIS=1 ecommerce_testing bash -c "
@@ -38,31 +38,22 @@ script:
 
 matrix:
   include:
-    - python: 3.5
+    - python: 3.8
       env:
         DJANGO_ENV=django22
         TESTNAME=quality-and-js
-        TARGETS="requirements.js check_translations_up_to_date validate_translations clean_static static quality validate_js check_keywords"
-    - python: 3.5
+        TARGETS="PYTHON_ENV=py38 requirements.js check_translations_up_to_date validate_translations clean_static static quality validate_js check_keywords"
+    - python: 3.8
       env:
         DJANGO_ENV=django22
         TESTNAME=test-python
-        TARGETS="requirements.js clean_static static validate_python"
+        TARGETS="PYTHON_ENV=py38 requirements.js clean_static static validate_python"
       after_success:
-        - pip install -U codecov
+        - pip3 install -U codecov
         - docker exec ecommerce_testing /edx/app/ecommerce/ecommerce/.travis/run_coverage.sh
         - codecov
-    - python: 3.8
-      env:
-        DJANGO_ENV=django22
-        TESTNAME=quality-and-js
-        TARGETS="requirements.js check_translations_up_to_date validate_translations clean_static static quality validate_js check_keywords"
     - python: 3.8
       env:
         DJANGO_ENV=django22
         TESTNAME=test-python
-        TARGETS="requirements.js clean_static static validate_python"
-      after_success:
-        - pip install -U codecov
-        - docker exec ecommerce_testing /edx/app/ecommerce/ecommerce/.travis/run_coverage.sh
-        - codecov
+        TARGETS="PYTHON_ENV=py38 requirements.js clean_static static acceptance"

.travis/docker-compose-travis.yml

@@ -3,14 +3,11 @@ version: "2"
 
 services:
   db:
-    image: mysql:5.6.45
+    image: mysql:5.7
     container_name: db
     command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
     environment:
-      MYSQL_ROOT_PASSWORD: ""
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-      MYSQL_USER: "ecomm001"
-      MYSQL_PASSWORD: "password"
+      MYSQL_ROOT_PASSWORD: "password"
       MYSQL_DATABASE: "ecommerce"
   ecommerce:
     image: edxops/ecommerce:latest
@@ -33,7 +30,7 @@ services:
       DB_NAME: "ecommerce"
       DB_PASSWORD: "password"
       DB_PORT: "3306"
-      DB_USER: "ecomm001"
+      DB_USER: "root"
       DJANGO_SETTINGS_MODULE: "ecommerce.settings.test"
       JASMINE_HOSTNAME: "localhost"
       JASMINE_WEB_DRIVER: "FirefoxHeadless"

Makefile

@@ -1,6 +1,6 @@
 NODE_BIN=./node_modules/.bin
 DIFF_COVER_BASE_BRANCH=master
-PYTHON_ENV=py35
+PYTHON_ENV=py38
 DJANGO_ENV_VAR=$(if $(DJANGO_ENV),$(DJANGO_ENV),django22)
 
 help:
@@ -40,20 +40,24 @@ requirements.js:
 	$(NODE_BIN)/bower install --allow-root
 
 requirements: requirements.js
-	pip install -r requirements/dev.txt --exists-action w
+	pip3 install -r requirements/dev.txt --exists-action w
+
+requirements.tox:
+	pip3 install -U pip==20.0.2
+	pip3 install -r requirements/tox.txt --exists-action w
 
 requirements.tox:
 	pip install -U pip==20.0.2
 	pip install -r requirements/tox.txt --exists-action w
 
 production-requirements: requirements.js
-	pip install -r requirements.txt --exists-action w
+	pip3 install -r requirements.txt --exists-action w
 
 migrate: requirements.tox
-	tox -e $(PYTHON_ENV)-migrate
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-migrate
 
 serve: requirements.tox
-	tox -e $(PYTHON_ENV)-serve
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-serve
 
 clean:
 	find . -name '*.pyc' -delete
@@ -66,10 +70,10 @@ run_check_isort: requirements.tox
 	tox -e $(PYTHON_ENV)-check_isort
 
 run_isort: requirements.tox
-	tox -e $(PYTHON_ENV)-run_isort
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-run_isort
 
 run_pycodestyle: requirements.tox
-	tox -e $(PYTHON_ENV)-pycodestyle
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-pycodestyle
 
 run_pep8: run_pycodestyle
 
@@ -86,6 +90,9 @@ validate_js:
 validate_python: clean requirements.tox
 	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-tests
 
+acceptance: clean requirements.tox
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-acceptance
+
 fast_validate_python: clean requirements.tox
 	DISABLE_ACCEPTANCE_TESTS=True tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-tests
 
@@ -110,13 +117,13 @@ e2e: requirements.tox
 	tox -e $(PYTHON_ENV)-e2e
 
 extract_translations: requirements.tox
-	tox -e $(PYTHON_ENV)-extract_translations
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-extract_translations
 
 dummy_translations: requirements.tox
-	tox -e $(PYTHON_ENV)-dummy_translations
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-dummy_translations
 
 compile_translations: requirements.tox
-	tox -e $(PYTHON_ENV)-compile_translations
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-compile_translations
 
 fake_translations: extract_translations dummy_translations compile_translations
 
@@ -130,13 +137,13 @@ update_translations: pull_translations fake_translations
 
 # extract_translations should be called before this command can detect changes
 detect_changed_source_translations: requirements.tox
-	tox -e $(PYTHON_ENV)-detect_changed_translations
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-detect_changed_translations
 
 check_translations_up_to_date: fake_translations detect_changed_source_translations
 
 # Validate translations
 validate_translations: requirements.tox
-	tox -e $(PYTHON_ENV)-validate_translations
+	tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-validate_translations
 
 # Scan the Django models in all installed apps in this project for restricted field names
 check_keywords: requirements.tox
@@ -146,13 +153,13 @@ export CUSTOM_COMPILE_COMMAND = make upgrade
 upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	pip install -q -r requirements/pip_tools.txt
 	pip-compile --rebuild --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
-	pip-compile --rebuild --upgrade -o requirements/tox.txt requirements/tox.in
-	pip-compile --rebuild --upgrade -o requirements/base.txt requirements/base.in
-	pip-compile --rebuild --upgrade -o requirements/docs.txt requirements/docs.in
-	pip-compile --rebuild --upgrade -o requirements/e2e.txt requirements/e2e.in
-	pip-compile --rebuild --upgrade -o requirements/test.txt requirements/test.in
-	pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/dev.in
-	pip-compile --rebuild --upgrade -o requirements/production.txt requirements/production.in
+	pip-compile --upgrade -o requirements/tox.txt requirements/tox.in
+	pip-compile --upgrade -o requirements/base.txt requirements/base.in
+	pip-compile --upgrade -o requirements/docs.txt requirements/docs.in
+	pip-compile --upgrade -o requirements/e2e.txt requirements/e2e.in
+	pip-compile --upgrade -o requirements/test.txt requirements/test.in
+	pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
+	pip-compile --upgrade -o requirements/production.txt requirements/production.in
 	# Let tox control the Django version for tests
 	sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
 	mv requirements/test.tmp requirements/test.txt

build.js

@@ -67,6 +67,10 @@
         {
             name: 'js/views/authorizenet',
             exclude: ['js/common']
+        },
+        {
+            name: 'js/views/cybersource_microform',
+            exclude: ['js/common']
         }
     ]
 })