From 95929402dcad79e82f5d394948f56f04de1ed291 Mon Sep 17 00:00:00 2001 From: Jay Wang Date: Sat, 27 Jan 2024 13:51:37 -0500 Subject: [PATCH] Use package.json to control python package version Signed-off-by: Jay Wang --- notebook-widget/MANIFEST.in | 3 ++- notebook-widget/package.json | 1 + notebook-widget/setup.cfg | 20 ++++++++++---------- notebook-widget/setup.py | 13 +++++++++++-- 4 files changed, 24 insertions(+), 13 deletions(-) create mode 120000 notebook-widget/package.json diff --git a/notebook-widget/MANIFEST.in b/notebook-widget/MANIFEST.in index 5a1434e..25f61d4 100644 --- a/notebook-widget/MANIFEST.in +++ b/notebook-widget/MANIFEST.in @@ -4,4 +4,5 @@ recursive-exclude * *.py[co] recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif -recursive-include wizmap * \ No newline at end of file +recursive-include wizmap * +include package.json \ No newline at end of file diff --git a/notebook-widget/package.json b/notebook-widget/package.json new file mode 120000 index 0000000..4e26811 --- /dev/null +++ b/notebook-widget/package.json @@ -0,0 +1 @@ +../package.json \ No newline at end of file diff --git a/notebook-widget/setup.cfg b/notebook-widget/setup.cfg index 09ca27c..9c84746 100644 --- a/notebook-widget/setup.cfg +++ b/notebook-widget/setup.cfg @@ -1,15 +1,15 @@ -[bumpversion] -current_version = 0.1.2 -commit = True -tag = True +# [bumpversion] +# current_version = 0.1.2 +# commit = True +# tag = True -[bumpversion:file:setup.py] -search = version="{current_version}" -replace = version="{new_version}" +# [bumpversion:file:setup.py] +# search = version="{current_version}" +# replace = version="{new_version}" -[bumpversion:file:wizmap/__init__.py] -search = __version__ = "{current_version}" -replace = __version__ = "{new_version}" +# [bumpversion:file:wizmap/__init__.py] +# search = __version__ = "{current_version}" +# replace = __version__ = "{new_version}" [bdist_wheel] universal = 1 diff --git a/notebook-widget/setup.py b/notebook-widget/setup.py index dc0c8f7..13ffd59 100644 --- a/notebook-widget/setup.py +++ b/notebook-widget/setup.py @@ -2,9 +2,10 @@ """The setup script.""" -from json import loads +from json import loads, load from setuptools import setup, find_packages from pathlib import Path +import os with open("README.md", "r") as readme_file: readme = readme_file.read() @@ -13,6 +14,14 @@ test_requirements = [] +# Read the version from package.json +package_json_path = "./package.json" + +# Read the package.json file +with open(package_json_path, "r", encoding="utf8") as f: + package_json = load(f) + version = package_json["version"] + setup( author="Jay Wang", author_email="jayw@zijie.wang", @@ -50,6 +59,6 @@ test_suite="tests", tests_require=test_requirements, url="https://github.com/poloclub/wizmap", - version="0.1.2", + version=version, zip_safe=False, )