Merge pull request #1444 from cmu-delphi/new-ci-make

Add make install-ci target to install without editable mode

Author: krivard

.github/workflows/python-ci.yml

@@ -32,7 +32,7 @@ jobs:
         pip install pylint pytest pydocstyle wheel
     - name: Install
       run: |
-        make install
+        make install-ci
     - name: Lint
       run: |
         make lint

_delphi_utils_python/Makefile

@@ -8,6 +8,11 @@ install: venv
 	pip install wheel ; \
 	pip install -e .
 
+install-ci: venv
+	. env/bin/activate; \
+	pip install wheel ; \
+	pip install .
+
 lint:
 	. env/bin/activate; pylint delphi_utils
 	. env/bin/activate; pydocstyle delphi_utils

_template_python/Makefile

@@ -1,7 +1,6 @@
 .PHONY = venv, lint, test, clean
 
-dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*')
-
+dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
 	python3.8 -m venv env
 
@@ -11,6 +10,12 @@ install: venv
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
+install-ci: venv
+	. env/bin/activate; \
+	pip install wheel ; \
+	pip install ../_delphi_utils_python ;\
+	pip install .
+
 lint:
 	. env/bin/activate; pylint $(dir)
 	. env/bin/activate; pydocstyle $(dir)

cdc_covidnet/Makefile

@@ -1,7 +1,6 @@
 .PHONY = venv, lint, test, clean
 
-dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*')
-
+dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
 	python3.8 -m venv env
 
@@ -11,6 +10,12 @@ install: venv
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
+install-ci: venv
+	. env/bin/activate; \
+	pip install wheel ; \
+	pip install ../_delphi_utils_python ;\
+	pip install .
+
 lint:
 	. env/bin/activate; pylint $(dir)
 	. env/bin/activate; pydocstyle $(dir)

changehc/Makefile

@@ -1,7 +1,6 @@
 .PHONY = venv, lint, test, clean
 
-dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*')
-
+dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
 	python3.8 -m venv env
 
@@ -11,6 +10,12 @@ install: venv
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
+install-ci: venv
+	. env/bin/activate; \
+	pip install wheel ; \
+	pip install ../_delphi_utils_python ;\
+	pip install .
+
 lint:
 	. env/bin/activate; pylint $(dir)
 	. env/bin/activate; pydocstyle $(dir)

claims_hosp/Makefile

@@ -1,7 +1,6 @@
 .PHONY = venv, lint, test, clean
 
-dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*')
-
+dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
 	python3.8 -m venv env
 
@@ -11,6 +10,12 @@ install: venv
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
+install-ci: venv
+	. env/bin/activate; \
+	pip install wheel ; \
+	pip install ../_delphi_utils_python ;\
+	pip install .
+
 lint:
 	. env/bin/activate; pylint $(dir)
 	. env/bin/activate; pydocstyle $(dir)

combo_cases_and_deaths/Makefile

@@ -1,7 +1,6 @@
 .PHONY = venv, lint, test, clean
 
-dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*')
-
+dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
 	python3.8 -m venv env
 
@@ -11,6 +10,12 @@ install: venv
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
+install-ci: venv
+	. env/bin/activate; \
+	pip install wheel ; \
+	pip install ../_delphi_utils_python ;\
+	pip install .
+
 lint:
 	. env/bin/activate; pylint $(dir)
 	. env/bin/activate; pydocstyle $(dir)

covid_act_now/Makefile

@@ -1,7 +1,6 @@
 .PHONY = venv, lint, test, clean
 
-dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*')
-
+dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
 	python3.8 -m venv env
 
@@ -11,6 +10,12 @@ install: venv
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
+install-ci: venv
+	. env/bin/activate; \
+	pip install wheel ; \
+	pip install ../_delphi_utils_python ;\
+	pip install .
+
 lint:
 	. env/bin/activate; pylint $(dir)
 	. env/bin/activate; pydocstyle $(dir)

doctor_visits/Makefile

@@ -1,7 +1,6 @@
 .PHONY = venv, lint, test, clean
 
-dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*')
-
+dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
 	python3.8 -m venv env
 
@@ -11,6 +10,12 @@ install: venv
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
+install-ci: venv
+	. env/bin/activate; \
+	pip install wheel ; \
+	pip install ../_delphi_utils_python ;\
+	pip install .
+
 lint:
 	. env/bin/activate; pylint $(dir)
 	. env/bin/activate; pydocstyle $(dir)

google_symptoms/Makefile

@@ -1,7 +1,6 @@
 .PHONY = venv, lint, test, clean
 
-dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*')
-
+dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
 	python3.8 -m venv env
 
@@ -11,6 +10,12 @@ install: venv
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
+install-ci: venv
+	. env/bin/activate; \
+	pip install wheel ; \
+	pip install ../_delphi_utils_python ;\
+	pip install .
+
 lint:
 	. env/bin/activate; pylint $(dir)
 	. env/bin/activate; pydocstyle $(dir)