Merge branch 'master' into master

Author: RishabhJain2018

.all-contributorsrc

@@ -3,27 +3,29 @@ eslint config file.
 */
 
 {
-	"env": {
-		"es6": 1,
-		"browser": 1
-	},
+  "env": {
+    "es6": 1,
+    "browser": 1
+  },
 
-	"globals": {
-		"angular":1,
-		"jquery": 1,
-		"$": 1,
-		"_": 1,
-		"moment": true
-	},
+  "globals": {
+    "angular": "readonly",
+    "jquery": "readonly",
+    "$": "readonly",
+    "_": "readonly",
+    "moment": "readonly"
+  },
 
-	"extends": "eslint:recommended",
+  "extends": "eslint:recommended",
 
-	"rules": {
-		"no-console": "warn",
-		"semi": ["error", 
-			"always", { 
-				"omitLastInOneLineBlock": true 
-			}
-		],
-	},
+  "rules": {
+    "no-console": "warn",
+    "semi": [
+      "error",
+      "always",
+      {
+        "omitLastInOneLineBlock": true
+      }
+    ]
+  }
 }

.coveralls.yml

@@ -0,0 +1,10 @@
+# npm configuration for CI builds
+fetch-timeout=600000
+fetch-retry-mintimeout=20000
+fetch-retry-maxtimeout=120000
+progress=false
+loglevel=warn
+maxsockets=50
+prefer-offline=true
+audit=false
+fund=false

.eslintrc

@@ -0,0 +1,17 @@
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+python:
+  install:
+    - requirements: requirements/readthedocs.txt
+
+sphinx:
+  configuration: docs/source/conf.py
+
+formats:
+  - epub
+  - pdf

.npmrc

@@ -39,14 +39,14 @@ jobs:
       script:
         # Build steps
         - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin || travis_terminate 1; fi
-        - docker-compose --profile worker --profile statsd build || travis_terminate 1;
+        - docker-compose --profile worker_py3_7 --profile worker_py3_8 --profile worker_py3_9 --profile statsd build || travis_terminate 1;
 
         # Frontend Tests
-        - docker-compose run nodejs bash -c "gulp dev && karma start --single-run && gulp staging" || travis_terminate 1;
+        - docker-compose run nodejs bash -c "npm install && gulp dev && karma start --single-run --reporters=junit,coverage && gulp staging" || travis_terminate 1;
 
         # Backend Tests
         - docker-compose run -e DJANGO_SETTINGS_MODULE=settings.test django python manage.py flush --noinput || travis_terminate 1;
-        - docker-compose run -e DJANGO_SETTINGS_MODULE=settings.test django pytest --cov . --cov-config .coveragerc || travis_terminate 1;
+        - docker-compose run -e DJANGO_SETTINGS_MODULE=settings.test django pytest --cov . --cov-config .coveragerc --cov-report=xml:coverage-backend.xml --junitxml=junit-backend.xml -o junit_family=legacy || travis_terminate 1;
 
         # Check Code Quality
         - docker-compose run -e DJANGO_SETTINGS_MODULE=settings.dev -e VERBOSE=1 django bash -c "
@@ -63,8 +63,20 @@ jobs:
           echo 'All code quality checks passed!'" || travis_terminate 1;
 
       after_success:
-        - bash <(curl -s https://codecov.io/bash)
-        - coveralls --rcfile=.coveragerc
+        # Install Codecov CLI
+        - pip install codecov-cli
+        
+        # Upload backend test results to Codecov
+        - codecovcli do-upload --report-type test_results --file junit-backend.xml
+        
+        # Upload frontend test results to Codecov (if available)
+        - codecovcli do-upload --report-type test_results --file coverage/frontend/TEST-*.xml || true
+        
+        # Upload backend coverage to Codecov
+        - bash <(curl -s https://codecov.io/bash) -f coverage-backend.xml -F backend
+        
+        # Upload frontend coverage to Codecov
+        - bash <(curl -s https://codecov.io/bash) -f coverage/frontend/lcov.info -F frontend
 
     - stage: Package & Deployment
       name: Push & Deploy Services
@@ -81,4 +93,4 @@ notifications:
   email:
     on_success: change
     on_failure: always
-  slack: cloudcv:gy3CGQGNXLwXOqVyzXGZfdea
+  slack: cloudcv:gy3CGQGNXLwXOqVyzXGZfdea

.readthedocs.yaml

@@ -58,6 +58,7 @@ class ChallengeAdmin(ImportExportTimeStampedAdmin):
         "workers",
         "task_def_arn",
         "github_repository",
+        "github_branch",
     )
     list_filter = (
         ChallengeFilter,
@@ -75,6 +76,7 @@ class ChallengeAdmin(ImportExportTimeStampedAdmin):
         "creator__team_name",
         "slug",
         "github_repository",
+        "github_branch",
     )
     actions = [
         "start_selected_workers",