Modified Makefile to work again

Author: sgeulette

Makefile

@@ -15,25 +15,21 @@ all: run
 help:
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n\nTargets:\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-10s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST)
 
-.PHONY: bootstrap
-bootstrap:
-	virtualenv-2.7 .
-	./bin/python bootstrap.py
-
 .PHONY: setup
 setup:  ## Setups environment
-	# if command -v python2 >/dev/null && command -v virtualenv; then virtualenv -p python2 . ; elif command -v virtualenv-2.7; then virtualenv-2.7 . ;fi
-	if command -v virtualenv-2.7; then virtualenv-2.7 . ; elif command -v python2 >/dev/null && command -v virtualenv; then virtualenv -p python2 . ; fi
+	# if command -v virtualenv-2.7; then virtualenv-2.7 . ; elif command -v python2 >/dev/null && command -v virtualenv; then virtualenv -p python2 . ; fi
+	virtualenv .
 	./bin/pip install --upgrade pip
 	./bin/pip install -r requirements.txt
 
 .PHONY: buildout
 buildout:  ## Runs setup and buildout
 	rm -f .installed.cfg .mr.developer.cfg
 	if ! test -f bin/buildout;then make setup;fi
-	if ! test -d /srv/cache/download/dist; then mkdir /srv/cache/download/dist || true; fi
-	if ! test -f /srv/cache/download/dist/appy-1.0.15.tar.gz; then scp -o 'StrictHostKeyChecking no' docs001:/srv/cache/download/dist/appy-1.0.15.tar.gz /srv/cache/download/dist/ || true; fi
-	if ! test -f var/filestorage/Data.fs;then make standard-config; else bin/buildout -v;fi
+	# if ! test -d /srv/cache/download/dist; then mkdir /srv/cache/download/dist || true; fi
+	# if ! test -f /srv/cache/download/dist/appy-1.0.15.tar.gz; then scp -o 'StrictHostKeyChecking no' docs001:/srv/cache/download/dist/appy-1.0.15.tar.gz /srv/cache/download/dist/ || true; fi
+	# if ! test -f var/filestorage/Data.fs;then make standard-config; else bin/buildout -v;fi
+	bin/buildout -v
 	git checkout .gitignore
 
 .PHONY: copy

prod.cfg

@@ -9,8 +9,6 @@ extends =
 
 download-cache = download-cache
 
-
-
 parts +=
     instance-debug
     zeoserver

requirements.txt

@@ -1,3 +1,4 @@
-setuptools==78.1.0
-wheel==0.45.1
-zc.buildout==4.1.7
+#-c https://dist.plone.org/release/6.1.1/requirements.txt
+setuptools == 78.1.0
+zc.buildout == 4.1.7
+

versions-base.cfg

@@ -1,8 +1,6 @@
 [versions]
 setuptools = 78.1.0
-wheel = 0.45.1
 zc.buildout = 4.1.7
 
-
 natsort = 6.2.1
 beautifulsoup4 = 4.11.2