Skip to content

Commit be97143

Browse files
authored
🔨 Rest development versions to post0 (#181)
1 parent 0aa2738 commit be97143

File tree

2 files changed

+40
-17
lines changed

2 files changed

+40
-17
lines changed

‎Makefile‎

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,44 @@ PYTHON_DIR := $(CLIENTS_DIR)/python
99
@echo "WARNING ##### $@ does not exist, cloning $< as $@ ############"; cp $< $@)
1010

1111

12-
.PHONY: info
13-
info: ## general information
14-
# system
15-
@echo ' CURDIR : ${CURDIR}'
16-
@echo ' NOW_TIMESTAMP : ${NOW_TIMESTAMP}'
17-
@echo ' VCS_URL : ${VCS_URL}'
18-
@echo ' VCS_REF : ${VCS_REF}'
19-
# installed in .venv
20-
@which python
21-
@pip list
22-
# API
23-
@echo ' title : $(shell bash $(SCRIPTS_DIR)/jq.bash -r .info.title $(REPO_ROOT)/api/openapi.json)'
24-
@echo ' version : $(shell bash $(SCRIPTS_DIR)/jq.bash -r .info.version $(REPO_ROOT)/api/openapi.json)'
25-
# nox
26-
@echo nox --list-session
12+
.PHONY: info-api info-envs info-tools info-pip info
13+
14+
info-api: ## info on openapi specs
15+
# Openapi specs ---------
16+
@echo ' title : $(shell bash $(SCRIPTS_DIR)/jq.bash -r .info.title $(REPO_ROOT)/api/openapi.json)'
17+
@echo ' version : $(shell bash $(SCRIPTS_DIR)/jq.bash -r .info.version $(REPO_ROOT)/api/openapi.json)'
18+
19+
20+
info-envs: ## info on envs
21+
# Environments ----------
22+
@echo ' CURDIR : ${CURDIR}'
23+
@echo ' NOW_TIMESTAMP : ${NOW_TIMESTAMP}'
24+
@echo ' VCS_URL : ${VCS_URL}'
25+
@echo ' VCS_REF : ${VCS_REF}'
26+
27+
28+
info-tools: ## info on tooling
29+
# Tooling ---------------
30+
@echo ' make : $(shell make --version 2>&1 | head -n 1)'
31+
@echo ' jq : $(shell jq --version)'
32+
@echo ' awk : $(shell awk -W version 2>&1 | head -n 1)'
33+
@echo ' python : $(shell python3 --version)'
34+
@echo ' uv : $(shell uv --version)'
35+
@echo ' docker : $(shell docker --version)'
36+
@echo ' docker buildx : $(shell docker buildx version)'
37+
@echo ' docker compose : $(shell docker compose version)'
38+
39+
40+
info-pip: ## info index versions
41+
# Pypi ------------------
42+
@pip index versions \
43+
osparc \
44+
--pre \
45+
--index-url https://test.pypi.org/simple/ \
46+
--extra-index-url https://pypi.org/simple/
47+
48+
49+
info: info-api info-envs info-tools info-pip ## all infos
2750

2851

2952
.venv: .check-uv-installed

‎scripts/generate_version.bash‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ n_commits_to_merge_base=$(git rev-list --count "${merge_base}".."${current_commi
2222

2323
# NOTE:
2424
# - we develop using post-release versioning
25-
# - i.e. 1.2.3.post3.devN where N is the number of commits with respect to last release 1.2.3)
25+
# - i.e. 1.2.3.post0.devN where N is the number of commits with respect to last release 1.2.3)
2626
# - Another approach would be using a pre-release version but we do not want to decide on that version
2727
# - the releases are of the type 1.2.3
2828
# - we never do post releases as 1.2.3.postX but instead use patches i.e. 1.2.4
2929
# - the releases are defined using git tags (that is the case with n_commits_to_merge_base=0 )
3030
# - SEE .github/workflows/publish-python-client.yml for more details
3131
#
3232
if [ "$n_commits_to_merge_base" -gt 0 ]; then
33-
echo "${released_version}.post3.dev${n_commits_to_merge_base}"
33+
echo "${released_version}.post0.dev${n_commits_to_merge_base}"
3434
elif [ "$n_commits_to_merge_base" -eq 0 ]; then
3535
echo "${released_version}"
3636
else

0 commit comments

Comments
 (0)