@@ -35,7 +35,7 @@ publish: distclean version package test
35
35
36
36
$(generatedcode ) : dist/$(sdistname ) * .tar.gz
37
37
38
- docs : latest := $(shell git tag | sort -r | head -n 1)
38
+ docs : latest := $(shell git tag | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr | head -n 1)
39
39
docs : VERSION $(generatedcode )
40
40
rm -rf docs
41
41
pip install --upgrade -r requirements.txt
@@ -83,8 +83,9 @@ increase_dev = $(call macro,$(1)).$(call micro,$(1)).$(call patch,$(1)).dev$$(($
83
83
devversion : VERSION.dev VERSION; cat VERSION
84
84
version : VERSION; cat VERSION
85
85
86
- VERSION.dev : devver := $(shell curl --silent "https://api.github.com/repos/clamsproject/mmif-python/git/refs/tags" | grep '"ref":' | sed -E 's/.+refs\/tags\/([0-9.]+) ",/\1/g' | sort | tail -n 1)
87
- VERSION.dev : specver := $(shell curl --silent "https://api.github.com/repos/clamsproject/mmif/git/refs/tags" | grep '"ref":' | grep -v 'py-' | sed -E 's/.+refs\/tags\/(spec-) ?([0-9.]+)",/\2/g' | sort | tail -n 1)
86
+ # since the GH api will return tags in chronological order, we can just grab the last one without sorting
87
+ VERSION.dev : devver := $(shell curl --silent "https://api.github.com/repos/clamsproject/mmif-python/git/refs/tags" | grep '"ref":' | sed -E 's/.+refs\/tags\/([0-9.]+) ",/\1/g' | tail -n 1)
88
+ VERSION.dev : specver := $(shell curl --silent "https://api.github.com/repos/clamsproject/mmif/git/refs/tags" | grep '"ref":' | grep -v 'py-' | sed -E 's/.+refs\/tags\/(spec-) ?([0-9.]+)",/\2/g' | tail -n 1)
88
89
VERSION.dev :
89
90
@echo DEVVER: $(devver )
90
91
@echo SPECVER: $(specver )
@@ -94,7 +95,7 @@ VERSION.dev:
94
95
else echo $(call add_dev,$(specver ) ) ; fi \
95
96
> VERSION.dev
96
97
97
- VERSION : version := $(shell git tag | sort -r | head -n 1)
98
+ VERSION : version := $(shell git tag | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr | head -n 1)
98
99
VERSION :
99
100
@if [ -e VERSION.dev ] ; \
100
101
then cp VERSION.dev VERSION; \
0 commit comments