[SE-3401] Updates BuildTools UglifyJS configuration to be consistent on different machines

.annotation_safe_list.yml

@@ -131,36 +131,6 @@ djcelery.WorkerState:
 edx_oauth2_provider.TrustedClient:
   ".. no_pii:": "No PII"
 
-# Via Proctoring
-edx_proctoring.ProctoredExam:
-  ".. no_pii:": "No PII"
-edx_proctoring.ProctoredExamReviewPolicy:
-  ".. no_pii:": "No PII"
-edx_proctoring.ProctoredExamReviewPolicyHistory:
-  ".. no_pii:": "No PII"
-edx_proctoring.ProctoredExamSoftwareSecureComment:
-  ".. no_pii:": "No PII"
-edx_proctoring.ProctoredExamSoftwareSecureReview:
-  ".. pii:": "Proctored exam review feedback from Software Secure, contains video_url. Retained for record keeping."
-  ".. pii_types:": video
-  ".. pii_retirement:": retained
-edx_proctoring.ProctoredExamSoftwareSecureReviewHistory:
-  ".. pii:": "Proctored exam review feedback from Software Secure, contains video_url. Retained for record keeping."
-  ".. pii_types:": video
-  ".. pii_retirement:": retained
-edx_proctoring.ProctoredExamStudentAllowance:
-  ".. no_pii:": "No PII"
-edx_proctoring.ProctoredExamStudentAllowanceHistory:
-  ".. no_pii:": "No PII"
-edx_proctoring.ProctoredExamStudentAttempt:
-  ".. pii:": "Tracks attempts by a user to take a proctored exam. Contains student_name. Retained for record keeping."
-  ".. pii_types:": name
-  ".. pii_retirement:": retained
-edx_proctoring.ProctoredExamStudentAttemptHistory:
-  ".. pii:": "Tracks attempts by a user to take a proctored exam. Contains student_name. Retained for record keeping."
-  ".. pii_types:": name
-  ".. pii_retirement:": retained
-
 # Via VAL
 edxval.CourseVideo:
   ".. no_pii:": "No PII"

.coveragerc

@@ -1,6 +1,6 @@
 # .coveragerc for edx-platform
 [run]
-data_file = reports/.coverage
+data_file = reports/${TEST_SUITE}.coverage
 source =
     cms
     common/djangoapps
@@ -30,6 +30,7 @@ omit =
 
 concurrency=multiprocessing
 parallel = true
+relative_files = true
 
 [report]
 ignore_errors = True

.github/CODEOWNERS

@@ -1,41 +1,41 @@
 # This does not cover all the code in edx-platform but it's a good start.
 
 # Core
-common/djangoapps/student/			@edx/platform-core
-common/djangoapps/third_party_auth/		@edx/platform-authn
-common/lib/xmodule/xmodule/			@edx/platform-core
-lms/djangoapps/course_api/blocks		@edx/platform-core
-lms/djangoapps/courseware/			@edx/platform-core
-lms/djangoapps/grades/				@edx/platform-grades
-lms/djangoapps/instructor/			@edx/platform-core
-lms/djangoapps/instructor_task/			@edx/platform-core
-lms/djangoapps/mobile_api/			@edx/platform-mobile
-openedx/core/djangoapps/contentserver/		@edx/platform-core
-openedx/core/djangoapps/heartbeat/		@edx/platform-core
-openedx/core/djangoapps/oauth_dispatch		@edx/platform-authn
-openedx/core/djangoapps/user_api/		@edx/platform-authn
-openedx/core/djangoapps/user_authn/		@edx/platform-authn
-openedx/features/course_experience/		@edx/platform-courseware
+common/djangoapps/student/                 @edx/platform-core
+common/djangoapps/third_party_auth/        @edx/platform-authn
+common/lib/xmodule/xmodule/                @edx/platform-core
+lms/djangoapps/course_api/blocks           @edx/platform-core
+lms/djangoapps/courseware/                 @edx/platform-core
+lms/djangoapps/grades/                     @edx/platform-grades
+lms/djangoapps/instructor/                 @edx/platform-core
+lms/djangoapps/instructor_task/            @edx/platform-core
+lms/djangoapps/mobile_api/                 @edx/platform-mobile
+openedx/core/djangoapps/contentserver/     @edx/platform-core
+openedx/core/djangoapps/heartbeat/         @edx/platform-core
+openedx/core/djangoapps/oauth_dispatch     @edx/platform-authn
+openedx/core/djangoapps/user_api/          @edx/platform-authn
+openedx/core/djangoapps/user_authn/        @edx/platform-authn
+openedx/features/course_experience/        @edx/platform-courseware
 
 # Core Extensions 
-common/lib/xmodule/xmodule/capa_module.py	@edx/platform-core-extensions
-common/lib/xmodule/xmodule/html_module.py	@edx/platform-core-extensions
-common/lib/xmodule/xmodule/video_module		@edx/platform-core-extensions
-lms/djangoapps/discussion/			@edx/platform-core-extensions
-lms/djangoapps/edxnotes				@edx/platform-core-extensions
+common/lib/xmodule/xmodule/capa_module.py  @edx/platform-core-extensions
+common/lib/xmodule/xmodule/html_module.py  @edx/platform-core-extensions
+common/lib/xmodule/xmodule/video_module    @edx/platform-core-extensions
+lms/djangoapps/discussion/                 @edx/platform-core-extensions
+lms/djangoapps/edxnotes                    @edx/platform-core-extensions
 
 # Analytics
-common/djangoapps/track/			@edx/edx-data-engineering
+common/djangoapps/track/                   @edx/edx-data-engineering
 
 # Credentials
-lms/djangoapps/certificates/			@edx/platform-credentials
+lms/djangoapps/certificates/               @edx/platform-credentials
 
 # Discovery
-common/djangoapps/course_modes/			@edx/platform-discovery
-common/djangoapps/enrollment/			@edx/platform-discovery
-lms/djangoapps/commerce/			@edx/ecommerce
-lms/djangoapps/experiments/			@edx/rev-team
-lms/djangoapps/learner_dashboard/		@edx/platform-discovery
-openedx/features/content_type_gating/		@edx/rev-team
-openedx/features/course_duration_limits/	@edx/rev-team
-openedx/features/discounts/					@edx/rev-team
+common/djangoapps/course_modes/            @edx/platform-discovery
+common/djangoapps/enrollment/              @edx/platform-discovery
+lms/djangoapps/commerce/                   @edx/rev-team
+lms/djangoapps/experiments/                @edx/rev-team
+lms/djangoapps/learner_dashboard/          @edx/platform-discovery
+openedx/features/content_type_gating/      @edx/rev-team
+openedx/features/course_duration_limits/   @edx/rev-team
+openedx/features/discounts/                @edx/rev-team

.github/renovate.json

@@ -4,7 +4,7 @@
     "schedule:weekdays",
     ":preserveSemverRanges"
   ],
-  "prConcurrentLimit": 2,
+  "prConcurrentLimit": 5,
   "includePaths": [
     "package.json"
   ]

.gitignore

@@ -7,6 +7,8 @@
 # and so should not be destroyed by "make clean".
 # start-noclean
 requirements/private.txt
+requirements/edx/private.in
+requirements/edx/private.txt
 lms/envs/private.py
 cms/envs/private.py
 # end-noclean
@@ -85,6 +87,7 @@ test_root/uploads/
 django-pyfs
 .tox/
 common/test/db_cache/bok_choy_*.yaml
+common/test/data/badges/*.png
 
 ### Installation artifacts
 *.egg-info
@@ -143,10 +146,3 @@ dist
 
 # Locally generated PII reports
 pii_report
-
-# Local documentation builds
-docs/_build
-docs/cms
-docs/common
-docs/lms
-docs/openedx

.pii_annotations.yml

@@ -1,7 +1,7 @@
 source_path: ./
 report_path: pii_report
 safelist_path: .annotation_safe_list.yml
-coverage_target: 100.0
+coverage_target: 94.5
 # See OEP-30 for more information on these values and what they mean:
 # https://open-edx-proposals.readthedocs.io/en/latest/oep-0030-arch-pii-markup-and-auditing.html#docstring-annotations
 annotations:

.tx/config

@@ -66,3 +66,15 @@ file_filter = conf/locale/<lang>/LC_MESSAGES/edx_proctoring_proctortrack.po
 source_file = conf/locale/en/LC_MESSAGES/edx_proctoring_proctortrack.po
 source_lang = en
 type = PO
+
+[open-edx-releases.release-juniper]
+file_filter = conf/locale/<lang>/LC_MESSAGES/django.po
+source_file = conf/locale/en/LC_MESSAGES/django.po
+source_lang = en
+type = PO
+
+[open-edx-releases.release-juniper-js]
+file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs.po
+source_file = conf/locale/en/LC_MESSAGES/djangojs.po
+source_lang = en
+type = PO

CONTRIBUTING.rst

@@ -22,25 +22,41 @@ JIRA
 ----
 
 If you've got an idea for a new feature or new functionality for an existing feature,
-please start a discussion on the `edx-code`_ mailing list to get feedback from
-the community about the idea and your implementation choices.
-
-.. _edx-code: https://groups.google.com/forum/#!forum/edx-code
+please start a discussion in the `development <https://discuss.openedx.org/c/development>`__
+category of the discussion forum list to get feedback from the community about the idea
+and your implementation choices.
 
 If you then plan to contribute your code upstream, please `start a discussion on JIRA`_
 (you may first need to `create a free JIRA account`_).
 Start a discussion by visiting the JIRA website and clicking the "Create" button at the
 top of the page. Choose the project "Open Source Pull Requests" and the issue type
 "Feature Proposal". In the description give us as much detail as you can for the feature
 or functionality you are thinking about implementing. Include a link to any relevant
-edx-code mailing list discussions about your idea. We encourage you to do this before
-you begin implementing your feature, in order to get valuable feedback from the edX
-product team early on in your journey and increase the likelihood of a successful
-pull request.
+forum discussions about your idea. We encourage you to do this before you begin
+implementing your feature, in order to get valuable feedback from the edX product team
+early on in your journey and increase the likelihood of a successful pull request.
 
 .. _start a discussion on JIRA: https://openedx.atlassian.net/secure/Dashboard.jspa
 .. _create a free JIRA account: https://openedx.atlassian.net/admin/users/sign-up
 
+.. _forum:
+
+Discussion forum
+----------------
+
+To ask technical questions and chat with the community, do not hesitate to join the
+`Open edX discussion forum <https://discuss.openedx.org/>`__. There are different
+categories for different topics:
+
+- `Devops <https://discuss.openedx.org/c/devops>`__ for installation help
+- `Development <https://discuss.openedx.org/c/development>`__, where Open edX developers
+  unite
+- `Community <https://discuss.openedx.org/c/community>`__ to discuss organizational
+  matters in the open source community
+- `Announcements <https://discuss.openedx.org/c/announcements>`__ where official Open edX
+  announcement are made
+- `Educators <https://discuss.openedx.org/c/educators>`__, to discuss online learning in general
+
 Slack
 -----
 
@@ -51,34 +67,17 @@ between 13:00 and 21:00 UTC (9am to 5pm US Eastern time),
 but interesting conversations can happen at any time.
 There are many different channels available for different topics, including:
 
-* ``#ops`` for installation help
 * ``#events`` for upcoming events related to Open edX
 * ``#content`` for discussions about course content and creating the best courses
 
 And lots more! You can also make your own channels to discuss new topics.
 
+Note that Slack is no longer the recommended communication channel to ask about
+technical issues. To do so, you should instead join the `official forum <#forum>`__.
+
 .. _Slack: https://slack.com/
 .. _Sign up for a free account: https://openedx-slack-invite.herokuapp.com/
 
-Mailing Lists
--------------
-
-For asynchronous conversation, we have several mailing lists on Google Groups:
-
-* `openedx-ops`_: everything related to *running* Open edX. This includes
-  installation issues, server management, cost analysis, and so on.
-* `openedx-translation`_: everything related to *translating* Open edX into
-  other languages. This includes volunteer translators, our internationalization
-  infrastructure, issues related to Transifex, and so on.
-* `openedx-analytics`_: everything related to *analytics* in Open edX.
-* `edx-code`_: everything related to the *code* in Open edX. This includes
-  feature requests, idea proposals, refactorings, and so on.
-
-.. _openedx-ops: https://groups.google.com/forum/#!forum/openedx-ops
-.. _openedx-translation: https://groups.google.com/forum/#!forum/openedx-translation
-.. _openedx-analytics: https://groups.google.com/forum/#!forum/openedx-analytics
-.. _edx-code: https://groups.google.com/forum/#!forum/edx-code
-
 Byte-sized Tasks & Bugs
 -----------------------
 
@@ -195,7 +194,7 @@ By opening up a pull request, we expect the following things:
    unable to participate in the review process.
 
 3. If you have questions, you will ask them by either commenting on the pull
-   request or asking us in Slack or on the mailing list.
+   request or asking us in the discussion forum or on Slack.
 
 4. If you do not respond to comments on your pull request within 7 days, we
    will close it. You are welcome to re-open it when you are ready to engage.

Makefile

@@ -1,5 +1,6 @@
 # Do things in edx-platform
-.PHONY: clean docs extract_translations help pull pull_translations push_translations requirements shell upgrade
+.PHONY: clean extract_translations help pull pull_translations push_translations requirements shell upgrade
+.PHONY: api-docs docs guides swagger
 
 # Careful with mktemp syntax: it has to work on Mac and Ubuntu, which have differences.
 PRIVATE_FILES := $(shell mktemp -u /tmp/private_files.XXXXXX)
@@ -18,9 +19,22 @@ clean: ## archive and delete most git-ignored files
 	tar xf $(PRIVATE_FILES)
 	rm $(PRIVATE_FILES)
 
-docs: ## build the developer documentation for this repository
-	rm -rf docs/_build docs/cms docs/common docs/lms docs/openedx
-	cd docs; make html
+SWAGGER = docs/swagger.yaml
+
+docs: api-docs guides ## build all the developer documentation for this repository
+
+swagger: ## generate the swagger.yaml file
+	DJANGO_SETTINGS_MODULE=docs.docs_settings python manage.py lms generate_swagger --generator-class=edx_api_doc_tools.ApiSchemaGenerator -o $(SWAGGER)
+
+api-docs-sphinx: swagger	## generate the sphinx source files for api-docs
+	rm -f docs/api/gen/*
+	python docs/sw2sphinxopenapi.py $(SWAGGER) docs/api/gen
+
+api-docs: api-docs-sphinx	## build the REST api docs
+	cd docs/api; make html
+
+guides:	## build the developer guide docs
+	cd docs/guides; make clean html
 
 extract_translations: ## extract localizable strings from sources
 	i18n_tool extract -v
@@ -37,6 +51,8 @@ pull_translations: ## pull translations from Transifex
 	git clean -fdX conf/locale/rtl
 	git clean -fdX conf/locale/eo
 	i18n_tool validate
+	paver i18n_compilejs
+
 
 detect_changed_source_translations: ## check if translation files are up-to-date
 	i18n_tool changed
@@ -45,7 +61,8 @@ pull: ## update the Docker image used by "make shell"
 	docker pull edxops/edxapp:latest
 
 requirements: ## install development environment requirements
-	pip install -qr requirements/edx/development.txt --exists-action w
+	pip install -qr requirements/edx/pip-tools.txt
+	pip-sync -q requirements/edx/development.txt requirements/edx/private.*
 
 shell: ## launch a bash shell in a Docker container with all edx-platform dependencies installed
 	docker run -it -e "NO_PYTHON_UNINSTALL=1" -e "PIP_INDEX_URL=https://pypi.python.org/simple" -e TERM \
@@ -60,7 +77,7 @@ REQ_FILES = \
 	requirements/edx/coverage \
 	requirements/edx/paver \
 	requirements/edx-sandbox/shared \
-	requirements/edx-sandbox/base \
+	requirements/edx-sandbox/py35 \
 	requirements/edx/base \
 	requirements/edx/testing \
 	requirements/edx/development \
@@ -69,14 +86,17 @@ REQ_FILES = \
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: ## update the pip requirements files to use the latest releases satisfying our constraints
 	pip install -qr requirements/edx/pip-tools.txt
-	@for f in $(REQ_FILES); do \
+	@ export REBUILD='--rebuild'; \
+	for f in $(REQ_FILES); do \
 		echo ; \
 		echo "== $$f ===============================" ; \
-		pip-compile -v --no-emit-trusted-host --no-index --rebuild --upgrade -o $$f.txt $$f.in || exit 1; \
+		echo "pip-compile -v --no-emit-trusted-host --no-index $$REBUILD --upgrade -o $$f.txt $$f.in"; \
+		pip-compile -v --no-emit-trusted-host --no-index $$REBUILD --upgrade -o $$f.txt $$f.in || exit 1; \
+		export REBUILD=''; \
 	done
 	# Post process all of the files generated above to work around open pip-tools issues
 	scripts/post-pip-compile.sh $(REQ_FILES:=.txt)
 	# Let tox control the Django version for tests
-	grep "^django==" requirements/edx/base.txt > requirements/edx/django.txt
+	grep -e "^django==" requirements/edx/base.txt > requirements/edx/django.txt
 	sed '/^[dD]jango==/d' requirements/edx/testing.txt > requirements/edx/testing.tmp
 	mv requirements/edx/testing.tmp requirements/edx/testing.txt