Skip to content

Commit 7994e09

Browse files
🐛 Fix dependency issue (#80)
* update workflow before publishing python package * fix dependency issue and bump version * point to website in project description
1 parent ac62d39 commit 7994e09

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

api/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"homepage": "https://itisfoundation.github.io/osparc-simcore-clients/",
33
"python":
44
{
5-
"version": "0.6.0"
5+
"version": "0.6.1"
66
}
77
}

clients/python/Makefile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ UID := $(shell id -u)
99
artifacts_dir:
1010
-mkdir $(ARTIFACTS_DIR)
1111

12+
.PHONY: postprocess-build
13+
postprocess-build:
14+
black $(PYTHON_DIR)/artifacts/client/*.py
15+
@-rm -f $(PYTHON_DIR)/artifacts/client/README.md
16+
@echo "Please visit our [website](https://itisfoundation.github.io/osparc-simcore-clients/#/) for documentation" > $(PYTHON_DIR)/artifacts/client/README.md
17+
@-rm -rf $(PYTHON_DIR)/client/osparc/data/
18+
@-mkdir $(PYTHON_DIR)/client/osparc/data/
19+
@cp $(REPO_ROOT)/api/openapi.json $(PYTHON_DIR)/client/osparc/data/
20+
1221
# Generation of Python client
1322
.PHONY: python-client
1423
python-client: validate-api-specification artifacts_dir ## generate python client
@@ -25,9 +34,7 @@ python-client: validate-api-specification artifacts_dir ## generate python clien
2534
--additional-properties=$(subst $(space),$(comma),$(strip $(ADDITIONAL_PROPS))) \
2635
--package-name=osparc_client \
2736
--release-note="Updated to $(APP_VERSION)"
28-
black $(PYTHON_DIR)/artifacts/client/*.py
29-
@-mkdir $(PYTHON_DIR)/client/osparc/data/
30-
@cp $(REPO_ROOT)/api/openapi.json $(PYTHON_DIR)/client/osparc/data/
37+
$(MAKE) postprocess-build
3138

3239
.PHONY: python-client-from-templates
3340
python-client-from-templates: validate-api-specification artifacts_dir ## generate python client using templates in a specified directory (usage: 'make python-client-from-templates -e TEMPLATE_DIR=path/to/templates')
@@ -48,9 +55,7 @@ python-client-from-templates: validate-api-specification artifacts_dir ## genera
4855
--package-name=osparc_client \
4956
--release-note="Updated to $(APP_VERSION)" \
5057
--template-dir=/tmp/python_templates
51-
black $(PYTHON_DIR)/artifacts/client/*.py
52-
@-mkdir $(PYTHON_DIR)/client/osparc/data/
53-
@cp $(REPO_ROOT)/api/openapi.json $(PYTHON_DIR)/client/osparc/data/
58+
$(MAKE) postprocess-build
5459

5560
.PHONY: generator-help
5661
generator-help: ## help on client-api generator

clients/python/client/setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# prerequisite: setuptools
1818
# http://pypi.python.org/pypi/setuptools
1919

20-
REQUIRES = [f"osparc_client=={VERSION}", "httpx", "tqdm", "nest_asyncio"]
20+
REQUIRES = [f"osparc_client=={VERSION}", "httpx", "tqdm", "nest_asyncio", "tenacity"]
2121

2222
setup(
2323
name=NAME,
@@ -35,7 +35,10 @@
3535
"data/openapi.json",
3636
]
3737
},
38-
long_description="osparc client",
38+
long_description=(
39+
"Please visit our [website](https://itisfoundation.github.io/osparc-simcore-clients/#/)"
40+
"for documentation."
41+
),
3942
long_description_content_type="text/markdown",
4043
license="MIT",
4144
classifiers=[

0 commit comments

Comments
 (0)