CanDIG/candigv2-ingest merging: DIG-1658: Update commandline ingest i…

…nstructions (#667)

* updating submodules

* Update pip

* Update Makefile

* Update requirements.txt

* remove update setuptools

* setuptools first

* Update requirements.txt

* Update example.env

* Update Makefile

* manually update setuptools

* remove setuptools

* Update example.env

* remove setuptools

* updating submodules (#669)

Co-authored-by: github-actions <[email protected]>

* DIG-1663: Implement curator ingest in katsu and batch ingest (#666)

* fix clean up

* update tests

* add 200

* add comment

* update pip

* revert pip

* try pip update

* fix typo

* fix command

* fix command properly

* add #egg

* test names

* fix typos

* update pip

* revert reqs

* fix req

* fix req2

* remove setup upgrade

* remove setuptools upgrade

* delete auth

* update katsu

* update setuptools

* update ingest

* remove default site admin program auth

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>

Makefile

@@ -96,6 +96,7 @@ build-all:
 
 # Setup the entire stack
 	$(MAKE) init-docker
+	pip install --upgrade setuptools
 	pip install -U -r etc/venv/requirements.txt
 	$(foreach MODULE, $(CANDIG_MODULES), $(MAKE) build-$(MODULE); $(MAKE) compose-$(MODULE);)
 	./post_build.sh