Fix oppia#12503: Renaming proto folder for further migration to Pytho…

…n 3 (oppia#12672)

.circleci/config.yml

@@ -126,7 +126,7 @@ jobs:
           root: /home/circleci/
           paths:
             - oppia/extensions/classifiers/proto
-            - oppia/proto/
+            - oppia/proto_files/
             - oppia/node_modules/
             - oppia/third_party/
             - oppia_tools/

.github/CODEOWNERS

@@ -76,7 +76,7 @@
 # Answer classification team.
 /core/controllers/classifier*.py @oppia/ml
 /core/domain/classifier*.py @oppia/ml
-/proto/ @oppia/ml
+/proto_files/ @oppia/ml
 /core/templates/domain/classifier/ @oppia/ml
 /core/templates/services/classifier-data-backend-api.service*.ts @oppia/ml
 /extensions/classifiers/ @oppia/ml

.gitignore

@@ -5,7 +5,7 @@
 *.bak
 gae_runtime/*
 # Ignore the auto-generated protobuf python code.
-proto/*.py
+proto_files/*.py
 extensions/classifiers/proto/*.ts
 extensions/classifiers/proto/*.js
 # We have added .git over here such that "git check-ignore" command should

buf.gen.yaml

@@ -1,7 +1,7 @@
 version: v1beta1
 plugins:
   - name: python
-    out: proto
+    out: proto_files
 
   - name: js
     out: extensions/classifiers/proto

core/controllers/classifier.py

@@ -24,7 +24,7 @@
 from core.domain import email_manager
 from core.domain import exp_fetchers
 import feconf
-from proto import training_job_response_payload_pb2
+from proto_files import training_job_response_payload_pb2
 
 
 def validate_job_result_message_proto(job_result_proto):

core/controllers/classifier_test.py

@@ -34,8 +34,8 @@
 from core.platform import models
 from core.tests import test_utils
 import feconf
-from proto import text_classifier_pb2
-from proto import training_job_response_payload_pb2
+from proto_files import text_classifier_pb2
+from proto_files import training_job_response_payload_pb2
 import python_utils
 
 (classifier_models,) = models.Registry.import_models([models.NAMES.classifier])

core/domain/classifier_services_test.py

@@ -32,7 +32,7 @@
 from core.platform import models
 from core.tests import test_utils
 import feconf
-from proto import text_classifier_pb2
+from proto_files import text_classifier_pb2
 import utils
 
 (classifier_models,) = models.Registry.import_models(

core/domain/classifier_validators_test.py

@@ -29,7 +29,7 @@
 from core.platform import models
 from core.tests import test_utils
 import feconf
-from proto import text_classifier_pb2
+from proto_files import text_classifier_pb2
 import python_utils
 
 datastore_services = models.Registry.import_datastore_services()

core/domain/fs_services_test.py

@@ -27,7 +27,7 @@
 from core.domain import user_services
 from core.tests import test_utils
 import feconf
-from proto import text_classifier_pb2
+from proto_files import text_classifier_pb2
 import python_utils
 import utils
 

core/tests/test_utils.py

@@ -64,7 +64,7 @@
 import feconf
 import main
 import main_taskqueue
-from proto import text_classifier_pb2
+from proto_files import text_classifier_pb2
 import python_utils
 import schema_utils
 import utils

scripts/linters/general_purpose_linter.py

@@ -39,7 +39,7 @@
     'core/tests/build_sources/*', '*.mp3', '*.mp4', 'node_modules/*',
     'typings/*', 'local_compiled_js/*', 'webpack_bundles/*',
     'core/tests/services_sources/*', 'core/tests/release_sources/tmp_unzip.zip',
-    'scripts/linters/test_files/*', 'proto/*',
+    'scripts/linters/test_files/*', 'proto_files/*',
     'core/tests/release_sources/tmp_unzip.tar.gz',
     'core/templates/combined-tests.spec.ts',
     'core/templates/css/oppia-material.css',