ALI-Tax-Analyzer

Check-in [680d0be764]
Login

Check-in [680d0be764]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Revise Makefile on the diva18 validation branch to work with version 21.1.1 of pip.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | diva18
Files: files | file ages | folders
SHA3-256: 680d0be764457ea0d1f01c5a51a0e556aefdedafd43a4d884f98eafbb2435013
User & Date: mrh 2021-09-08 23:02:36.588
Original Comment: Revise Makefile to work with version 21.1.1 of pip.
Context
2021-09-08
23:02
Revise Makefile on the diva18 validation branch to work with version 21.1.1 of pip. Leaf check-in: 680d0be764 user: mrh tags: diva18
2021-05-24
18:45
Remove diva18*csv data files from the diva18 validation branch. check-in: 5e2abbf27b user: mrh tags: diva18
Changes
Unified Diff Ignore Whitespace Patch
Changes to Makefile.
20
21
22
23
24
25
26


27
28
29
30
31
32
33
	@echo "            to allow use of alita and alitaxanalyzer anywhere"
	@echo "help      : show this help message"

# target: clean
.PHONY=clean
clean:
	@find . -type d -name __pycache__ -prune -exec rm -rf {} \;


	@$(validation-cleanup)
	@if [ $(shell conda list alitaxanalyzer | grep -c pypi) = 1 ]; then \
		echo "uninstalling pip alitaxanalyzer package ..." ;\
		pip uninstall alitaxanalyzer --yes --quiet ;\
	fi

define validation-cleanup







>
>







20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
	@echo "            to allow use of alita and alitaxanalyzer anywhere"
	@echo "help      : show this help message"

# target: clean
.PHONY=clean
clean:
	@find . -type d -name __pycache__ -prune -exec rm -rf {} \;
	@find . -type d -name build -prune -exec rm -rf {} \;
	@find . -type d -name *.egg-info -prune -exec rm -rf {} \;
	@$(validation-cleanup)
	@if [ $(shell conda list alitaxanalyzer | grep -c pypi) = 1 ]; then \
		echo "uninstalling pip alitaxanalyzer package ..." ;\
		pip uninstall alitaxanalyzer --yes --quiet ;\
	fi

define validation-cleanup
56
57
58
59
60
61
62
63
valtest: package
	@cd validation ; ./test.sh ; cd ..

# target: package
.PHONY=package
package: alitaxanalyzer/calcfuncsfast.py
	@cd alitaxanalyzer ; unzip ../diva18.zip ; cd ..
	@pip install . | grep "Successfully installed"







|
58
59
60
61
62
63
64
65
valtest: package
	@cd validation ; ./test.sh ; cd ..

# target: package
.PHONY=package
package: alitaxanalyzer/calcfuncsfast.py
	@cd alitaxanalyzer ; unzip ../diva18.zip ; cd ..
	@pip install --use-feature=in-tree-build . | grep "Successfully installed"