[airavata-django-portal] 03/03: Merge branch 'code-formatting' into develop

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit 4f8118ac17db0fc8c9f605e009e1f2e5b33ef573
Merge: 39bf6e0 c9b8541
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Sep 17 17:27:32 2020 -0400

    Merge branch 'code-formatting' into develop

 .travis.yml                                        |  4 +--
 README.md                                          |  5 +++
 django_airavata/apps/admin/.prettierignore         |  2 ++
 django_airavata/apps/admin/package.json            |  4 ++-
 django_airavata/apps/admin/yarn.lock               |  5 +++
 django_airavata/apps/api/.prettierignore           |  1 +
 django_airavata/apps/api/apps.py                   |  2 +-
 django_airavata/apps/api/package.json              |  4 ++-
 django_airavata/apps/api/serializers.py            |  3 +-
 django_airavata/apps/api/urls.py                   |  6 ++--
 django_airavata/apps/api/yarn.lock                 |  5 +++
 django_airavata/apps/dataparsers/.prettierignore   |  2 ++
 django_airavata/apps/dataparsers/package.json      |  4 ++-
 django_airavata/apps/dataparsers/urls.py           |  6 ++--
 django_airavata/apps/dataparsers/yarn.lock         |  5 +++
 django_airavata/apps/groups/.prettierignore        |  2 ++
 django_airavata/apps/groups/package.json           |  4 ++-
 django_airavata/apps/groups/yarn.lock              |  5 +++
 django_airavata/apps/workspace/.prettierignore     |  4 +++
 .../.prettierignore                                |  2 ++
 .../package.json                                   |  4 ++-
 .../django-airavata-workspace-plugin-api/yarn.lock |  5 +++
 django_airavata/apps/workspace/package.json        |  4 ++-
 django_airavata/apps/workspace/yarn.lock           |  5 +++
 django_airavata/settings.py                        |  3 +-
 django_airavata/settings_local.py.ide              |  2 +-
 django_airavata/static/common/.prettierignore      |  2 ++
 django_airavata/static/common/package.json         |  4 ++-
 django_airavata/static/common/yarn.lock            |  5 +++
 docs/dev/developing_backend.md                     | 16 +++++++--
 docs/dev/developing_frontend.md                    | 38 +++++++++++++---------
 docs/dev/new_django_app.md                         |  4 ++-
 requirements-dev.txt                               |  4 ++-
 setup.cfg                                          |  6 ++++
 34 files changed, 141 insertions(+), 36 deletions(-)

diff --cc .travis.yml
index dabb811,9991f3a..6c87051
--- a/.travis.yml
+++ b/.travis.yml
@@@ -7,8 -7,8 +7,8 @@@ script
    - cp django_airavata/settings_local.py.sample django_airavata/settings_local.py
    - python manage.py migrate
    - python manage.py check
-   # For now ignore long line endings
-   - flake8 --ignore=E501 .
 -  - python manage.py test
+   - flake8 .
++  - python manage.py test
    - ./lint_js.sh
    - ./build_js.sh
    - ./test_js.sh
diff --cc README.md
index 4779abc,14cec56..94062cd
--- a/README.md
+++ b/README.md
@@@ -149,11 -148,12 +149,16 @@@ libraries
  
  Use a code editor that integrates with editorconfig and flake8. I also recommend
  autopep8 for automatically formatting code to follow the PEP8 guidelines.
+ Prettier is used for formatting JavaScript and Vue.js code.
+ 
+ See the docs for more information on
+ [developing the backend](./docs/dev/developing_backend.md) and
+ [frontend code](./docs/dev/developing_frontend.md).
  
 +### Running Django Tests
 +
 +Run `./runtests.py` to run the Django unit tests.
 +
  ## License
  
  The Apache Airavata Django Portal is licensed under the Apache 2.0 license. For