Issue15: move from setup.py to pyproject.toml #16
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
this is also more robust in case the separate version.py file is ever removed
galou
reviewed
May 18, 2024
| @@ -0,0 +1,31 @@ | |||
| # References: | |||
There was a problem hiding this comment.
Patch to start with:
diff --git a/Makefile b/Makefile
index 8149166..75e6645 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ WORKBENCH_TRANSLATION_CONTEXT = cool
MAINTAINER = me
EMAIL = [email protected]
URL = https://foobar.com/me/coolWB
+VERSION = 0.0.0
DESCRIPTION = The cool WB creates cool parametric objects
DEPENDENCIES_LIST = []
@@ -25,7 +26,8 @@ replace_strings:
sed -i 's/workbench_starterkit/$(WORKBENCH_DIR_NAME)/g' freecad/workbench_starterkit/init_gui.py
sed -i 's/workbench_starterkit/$(WORKBENCH_DIR_NAME)/g' freecad/workbench_starterkit/resources/translations/update_translation.sh
sed -i 's/workbench_starterkit/$(WORKBENCH_DIR_NAME)/g' freecad/workbench_starterkit/resources/translations/workbench_starterkit_es-ES.ts
- sed -i 's/workbench_starterkit/$(WORKBENCH_DIR_NAME)/g' setup.py
+ sed -i "s/__version__ = .*/__version__ = \'$(VERSION)\'/g" freecad/workbench_starterkit/version.py
+ sed -i 's/workbench_starterkit/$(WORKBENCH_DIR_NAME)/g' pyproject.toml
@# Rename workbench class name
sed -i 's/TemplateWorkbench/$(WORKBENCH_CLASS_NAME)/g' freecad/workbench_starterkit/init_gui.py
@# Rename workbench class properties
@@ -39,12 +41,12 @@ replace_strings:
sed -i 's/starterkit/$(WORKBENCH_TRANSLATION_CONTEXT)/g' freecad/workbench_starterkit/resources/translations/workbench_starterkit_es-ES.ts
@# Rename workbench directory
mv freecad/workbench_starterkit freecad/$(WORKBENCH_DIR_NAME)
- @# Update setup.py file
- sed -i 's/looooo/$(MAINTAINER)/g' setup.py
- sed -i 's/[email protected]/$(EMAIL)/g' setup.py
- sed -i 's|https://github.com/FreeCAD/Workbench-Starterkit|$(URL)|g' setup.py
- sed -i 's/template for a freecad extensions\, installable with pip/$(DESCRIPTION)/g' setup.py
- sed -i "s/\['numpy'\]/$(DEPENDENCIES_LIST)/g" setup.py
+ @# Update pyproject.toml file
+ sed -i 's/looooo/$(MAINTAINER)/g' pyproject.toml
+ sed -i 's/[email protected]/$(EMAIL)/g' pyproject.toml
+ sed -i 's|https://github.com/FreeCAD/freecad.workbench_starterkit|$(URL)|g' pyproject.toml
+ sed -i 's/template for a freecad extensions\, installable with pip/$(DESCRIPTION)/g' pyproject.toml
+ sed -i "s/\[\"numpy\"\]/$(DEPENDENCIES_LIST)/g" pyproject.toml
self-destruction:
echo "Remove Makefile"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Moves metadata from setup.py to a minimal pyproject.toml.
A minimal version of setup.py is maintained for compatibility reasons.
Tested with freecad v19.
Fixes #15