Merge pull request #279 from blink1073/handle-dynamic-version

Author: blink1073

jupyter_releaser/tests/conftest.py

@@ -53,9 +53,6 @@ def git_repo(tmp_path):
     changelog = tmp_path / "CHANGELOG.md"
     changelog.write_text(testutil.CHANGELOG_TEMPLATE, encoding="utf-8")
 
-    readme = tmp_path / "README.md"
-    readme.write_text("Hello from foo project\n", encoding="utf-8")
-
     config = Path(util.JUPYTER_RELEASER_CONFIG)
     config.write_text(testutil.TOML_CONFIG, encoding="utf-8")
 

jupyter_releaser/tests/test_functions.py

@@ -25,17 +25,26 @@ def test_get_repo(git_repo, mocker):
     assert util.get_repo() == repo
 
 
-def test_get_version_python(py_package):
+def test_get_version_pyproject_static(py_package):
     assert util.get_version() == "0.0.1"
     util.bump_version("0.0.2a0")
     assert util.get_version() == "0.0.2a0"
 
 
-def test_get_version_pyproject(py_package):
-    os.unlink("setup.py")
+def test_get_version_pyproject_dynamic(py_package):
+    py_project = py_package / "pyproject.toml"
+    text = py_project.read_text(encoding="utf-8")
+    text = text.replace("""[project]\nversion = "0.0.1\"""", "")
+    py_project.write_text(text, encoding="utf-8")
     assert util.get_version() == "0.0.1"
 
 
+def test_get_version_setuppy(py_package):
+    assert util.get_version() == "0.0.1"
+    util.bump_version("0.0.2a0")
+    assert util.get_version() == "0.0.2a0"
+
+
 def test_get_version_multipython(py_multipackage):
     prev_dir = os.getcwd()
     for package in py_multipackage:

jupyter_releaser/tests/util.py

@@ -62,13 +62,6 @@ def setup_cfg_template(package_name="foo", module_name=None):
 [metadata]
 name = {package_name}
 version = attr: {module_name or package_name}.__version__
-description = My package description
-long_description = file: README.md
-long_description_content_type = text/markdown
-license = BSD 3-Clause License
-author = foo
-author_email = [email protected]
-url = https://foo.com
 
 [options]
 zip_safe = False
@@ -79,15 +72,30 @@ def setup_cfg_template(package_name="foo", module_name=None):
 
 SETUP_PY_TEMPLATE = """__import__("setuptools").setup()\n"""
 
+LICENSE_TEMPLATE = "A fake license\n"
 
-def pyproject_template(sub_packages=[]):
-    res = """
+README_TEMPLATE = "A fake readme\n"
+
+
+def pyproject_template(project_name="foo", sub_packages=[]):
+    res = f"""
 [build-system]
-requires = ["setuptools>=40.8.0", "wheel"]
+requires = ["setuptools>=61.0.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
+name = "{project_name}"
 version = "0.0.1"
+description = "My package description"
+readme = "README.md"
+license = {{file = "LICENSE"}}
+authors = [
+  {{email = "[email protected]"}},
+  {{name = "foo"}}
+]
+
+[project.urls]
+homepage = "https://foo.com"
 """
     if sub_packages:
         res += f"""
@@ -118,6 +126,9 @@ def tbump_py_template(package_name="foo"):
     return f"""
 [[file]]
 src = "{package_name}.py"
+
+[[file]]
+src = "pyproject.toml"
 """
 
 
@@ -131,6 +142,7 @@ def tbump_py_template(package_name="foo"):
 include *.md
 include *.toml
 include *.yaml
+include LICENSE
 """
 
 CHANGELOG_TEMPLATE = f"""# Changelog
@@ -205,19 +217,27 @@ def write_files(git_repo, sub_packages=[], package_name="foo", module_name=None)
         )
 
         pyproject = git_repo / "pyproject.toml"
-        pyproject.write_text(pyproject_template(sub_packages), encoding="utf-8")
+        pyproject.write_text(
+            pyproject_template(package_name, sub_packages), encoding="utf-8"
+        )
 
         foopy = git_repo / f"{module_name}.py"
         foopy.write_text(PY_MODULE_TEMPLATE, encoding="utf-8")
 
         manifest = git_repo / "MANIFEST.in"
         manifest.write_text(MANIFEST_TEMPLATE, encoding="utf-8")
 
+        license = git_repo / "LICENSE"
+        license.write_text(LICENSE_TEMPLATE, encoding="utf-8")
+
         here = Path(__file__).parent
         text = here.parent.parent.joinpath(".pre-commit-config.yaml").read_text(
             encoding="utf-8"
         )
 
+        readme = git_repo / "README.md"
+        readme.write_text(README_TEMPLATE, encoding="utf-8")
+
         pre_commit = git_repo / ".pre-commit-config.yaml"
         pre_commit.write_text(text, encoding="utf-8")
 

jupyter_releaser/util.py

@@ -10,7 +10,9 @@
 import shlex
 import shutil
 import sys
+import tempfile
 import time
+import warnings
 from glob import glob
 from pathlib import Path
 from subprocess import CalledProcessError
@@ -20,7 +22,8 @@
 import toml
 from importlib_resources import files
 from jsonschema import Draft4Validator as Validator
-from pkg_resources import parse_version
+from packaging.version import parse as parse_version
+from pkginfo import Wheel
 
 from jupyter_releaser.tee import run as tee
 
@@ -134,20 +137,27 @@ def get_repo():
 
 def get_version():
     """Get the current package version"""
-    if SETUP_PY.exists():
-        return run("python setup.py --version").split("\n")[-1]
-    elif PYPROJECT.exists():
+    if PYPROJECT.exists():
         text = PYPROJECT.read_text(encoding="utf-8")
         data = toml.loads(text)
         project = data.get("project", {})
         version = project.get("version")
-        if not version:  # pragma: no cover
-            raise ValueError("No version identifier could be found!")
+        if not version:
+            with tempfile.TemporaryDirectory() as tempdir:
+                run(f"{sys.executable} -m build --wheel --outdir {tempdir}")
+                wheel_path = glob(f"{tempdir}/*.whl")[0]
+                wheel = Wheel(wheel_path)
+                version = wheel.version
         return version
-    elif PACKAGE_JSON.exists():
+
+    if PACKAGE_JSON.exists():
         return json.loads(PACKAGE_JSON.read_text(encoding="utf-8")).get("version", "")
-    else:  # pragma: no cover
-        raise ValueError("No version identifier could be found!")
+
+    if SETUP_PY.exists():
+        warnings.warn("Using deprecated setup.py invocation")
+        return run("python setup.py --version").split("\n")[-1]
+
+    raise ValueError("No version identifier could be found!")
 
 
 def normalize_path(path):

setup.cfg

@@ -36,12 +36,13 @@ install_requires =
     github-activity~=0.2
     importlib_resources
     jsonschema>=3.0.1
+    packaging
+    pkginfo
     pre-commit
     pypiserver
     pytest-check-links>=0.5
     requests
     requests_cache
-    setuptools~=60.0
     tbump~=6.7
     toml~=0.10
     twine