Skip to content

Commit 35ce615

Browse files
committed
Fix version in circuitpython-stubs
the configuration that tried to use setuptools_scm was broken. Instead, provides circuitpython-stubs' setup.py with the version determined by setuptools_scm running in the git source directory.
1 parent ddae771 commit 35ce615

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ stubs:
268268
@$(PYTHON) tools/extract_pyi.py ports/atmel-samd/bindings $(STUBDIR)
269269
@$(PYTHON) tools/extract_pyi.py ports/espressif/bindings $(STUBDIR)
270270
@$(PYTHON) tools/extract_pyi.py ports/raspberrypi/bindings $(STUBDIR)
271-
@cp setup.py-stubs circuitpython-stubs/setup.py
271+
@sed -e "s,__version__,`python -msetuptools_scm`," < setup.py-stubs > circuitpython-stubs/setup.py
272272
@cp README.rst-stubs circuitpython-stubs/README.rst
273273
@cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in
274274
@$(PYTHON) tools/board_stubs/build_board_specific_stubs/board_stub_builder.py

setup.py-stubs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,7 @@ setup(
4545
packages=list(package_data.keys()),
4646
package_data=package_data,
4747
package_dir = package_dir,
48-
setup_requires=["setuptools_scm", "setuptools>=38.6.0"],
49-
use_scm_version = {
50-
"root": "..",
51-
"relative_to": __file__,
52-
"local_scheme": local_scheme,
53-
"git_describe_command": "tools/describe --long",
54-
},
48+
setup_requires=["setuptools>=38.6.0"],
49+
version="__version__",
5550
zip_safe=False,
5651
)

0 commit comments

Comments
 (0)