From aa842886ee88f085c740ef88c6918593a197030e Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Mon, 7 Mar 2022 14:36:59 -0500 Subject: [PATCH 1/6] update setuptools_scm for publishing to PyPI --- setup.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 60684932..d7371ebf 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,8 @@ from setuptools import setup - -setup() + +def local_scheme(version): + return "" + +setup( + use_scm_version={"local_scheme": local_scheme}, +) From def2a957719d1b9fba3d1dea941941f98fe91da1 Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Mon, 7 Mar 2022 14:57:29 -0500 Subject: [PATCH 2/6] update linting --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index d7371ebf..f4d69ce2 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,10 @@ from setuptools import setup - + + def local_scheme(version): return "" - + + setup( use_scm_version={"local_scheme": local_scheme}, ) From fff09d83670db927a476549f706bcf424a13ac17 Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Mon, 7 Mar 2022 17:33:22 -0500 Subject: [PATCH 3/6] Revert "update setuptools_scm for publishing to PyPI" This reverts commit aa842886ee88f085c740ef88c6918593a197030e. --- setup.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/setup.py b/setup.py index f4d69ce2..60684932 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,3 @@ from setuptools import setup - -def local_scheme(version): - return "" - - -setup( - use_scm_version={"local_scheme": local_scheme}, -) +setup() From d5e896843fb13ec3fe07ba5efd29564cc2bd735b Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Mon, 7 Mar 2022 17:36:20 -0500 Subject: [PATCH 4/6] move local_scheme from setup.py to pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index c7d0ef9c..336c6537 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,3 +7,4 @@ target-version = ["py35"] [tool.setuptools_scm] write_to = "rsconnect_jupyter/version.py" +use_scm_version = {"local_scheme" = ""} \ No newline at end of file From 47717590bce1b8bde59854a3a7e29f961d0f5594 Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Mon, 7 Mar 2022 17:47:13 -0500 Subject: [PATCH 5/6] update syntax --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 336c6537..b26fe6ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,4 +7,4 @@ target-version = ["py35"] [tool.setuptools_scm] write_to = "rsconnect_jupyter/version.py" -use_scm_version = {"local_scheme" = ""} \ No newline at end of file +local_scheme = "" \ No newline at end of file From e1a33657cf85eb286a972c9fe069d94cd3c3dd59 Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Tue, 8 Mar 2022 10:35:37 -0500 Subject: [PATCH 6/6] set local_scheme to no-local-version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b26fe6ac..5f0a238a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,4 +7,4 @@ target-version = ["py35"] [tool.setuptools_scm] write_to = "rsconnect_jupyter/version.py" -local_scheme = "" \ No newline at end of file +local_scheme = "no-local-version" \ No newline at end of file