point back to main legal-api & misc updates to resolve conflicts

Signed-off-by: Hongjing Chen <[email protected]>

queue_services/entity-filer/Makefile

@@ -9,6 +9,9 @@ CURRENT_ABS_DIR:=$(patsubst %/,%,$(dir $(MKFILE_PATH)))
 PROJECT_NAME:=entity_filer
 DOCKER_NAME:=entity-filer
 
+# TODO remove this when the conversion to the new queue is completed
+export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
+
 #################################################################################
 # COMMANDS -- Setup                                                             #
 #################################################################################
@@ -39,7 +42,8 @@ clean-test: ## clean test files
 build-req: clean ## Upgrade requirements
 	test -f venv/bin/activate || python3 -m venv  $(CURRENT_ABS_DIR)/venv ;\
 	. venv/bin/activate ;\
-	pip install pip==20.1.1 ;\
+	pip install pip==24.0 ;\
+	pip install wheel==0.43.0 ;\
 	pip install -Ur requirements/prod.txt ;\
 	pip freeze | sort > requirements.txt ;\
 	cat requirements/bcregistry-libraries.txt >> requirements.txt ;\
@@ -48,7 +52,8 @@ build-req: clean ## Upgrade requirements
 install: clean ## Install python virtrual environment
 	test -f venv/bin/activate || python3 -m venv  $(CURRENT_ABS_DIR)/venv ;\
 	. venv/bin/activate ;\
-	pip install pip==20.1.1 ;\
+	pip install pip==24.0 ;\
+	pip install wheel==0.43.0 ;\
 	pip install -Ur requirements.txt
 
 install-dev: ## Install local application

queue_services/entity-filer/requirements.txt

@@ -26,4 +26,4 @@ reportlab==3.6.12
 git+https://github.com/bcgov/sbc-connect-common.git#egg=gcp-queue&subdirectory=python/gcp-queue
 git+https://github.com/bcgov/[email protected]#egg=registry_schemas
 git+https://github.com/bcgov/lear.git#egg=entity_queue_common&subdirectory=queue_services/common
-git+https://github.com/thorwolpert/lear.git@requirements-split-nats-2#egg=legal_api&subdirectory=legal-api
+git+https://github.com/bcgov/lear.git#egg=legal_api&subdirectory=legal-api