Merge pull request #118 from lsst-dm/u/womullan/2023aprPending

 pending apr

Makefile

@@ -2,25 +2,25 @@ VENVDIR = venv
 
 report.csv: venv
 	@( \
-		source $(VENVDIR)/bin/activate; \
+		. $(VENVDIR)/bin/activate; \
 		python milestones.py report --output report.csv --prefix "SIT COM SUM" --months 2\
 	)
 
 blockschedule.pdf: venv
 	@( \
-		source $(VENVDIR)/bin/activate; \
+		. $(VENVDIR)/bin/activate; \
 		python milestones.py blockschedule --start-date -20 \
 	)
 
 burndown.png: venv
 	( \
-		source $(VENVDIR)/bin/activate; \
+		. $(VENVDIR)/bin/activate; \
 		python milestones.py  burndown; \
 	)
 
 gantt.pdf: venv
 	( \
-		source $(VENVDIR)/bin/activate; \
+		. $(VENVDIR)/bin/activate; \
 		python milestones.py gantt --output=gantt.tex; \
 		xelatex gantt.tex; \
 		xelatex gantt.tex; \
@@ -30,13 +30,13 @@ gantt.pdf: venv
 venv:
 	python -m venv $(VENVDIR)
 	( \
-		source $(VENVDIR)/bin/activate; \
+		. $(VENVDIR)/bin/activate; \
 		pip install -r requirements.txt; \
 	)
 
 milestones.csv: venv
 	( \
-		source $(VENVDIR)/bin/activate; \
+		. $(VENVDIR)/bin/activate; \
 		python milestones.py csv; \
 	)
 
@@ -49,7 +49,7 @@ celeb: venv
 .PHONY: jira
 jira: venv
 	( \
-		source $(VENVDIR)/bin/activate; \
+		. $(VENVDIR)/bin/activate; \
 		python milestones.py jira; \
 	)
 

milestones/report.py

@@ -34,7 +34,8 @@ def report(args, milestones):
 
     print("Code, Forecast end, Last Month, delta1 ,  2 Month, delta2", file=out)
     for ms in milestones:
-        lmdue = lmmap[ms.code]
+        if ms.code in lmmap:
+            lmdue = lmmap[ms.code]
         if lmdue is None:  # may be new with no prior
             lmdue = ms.fdue
         print(f"{ms.code},{ms.name},"

requirements.txt

@@ -5,3 +5,4 @@ xlrd
 requests
 pyyaml
 JIRA
+keyring