Fix versioning

Author: evertlammerts

duckdb_packaging/_versioning.py

@@ -16,34 +16,34 @@
 
 def parse_version(version: str) -> tuple[int, int, int, int, int]:
     """Parse a version string into its components.
-    
+
     Args:
         version: Version string (e.g., "1.3.1", "1.3.2.rc3" or "1.3.1.post2")
-        
+
     Returns:
         Tuple of (major, minor, patch, post, rc)
-        
+
     Raises:
         ValueError: If version format is invalid
     """
     match = VERSION_RE.match(version)
     if not match:
         raise ValueError(f"Invalid version format: {version} (expected X.Y.Z, X.Y.Z.rcM or X.Y.Z.postN)")
-    
+
     major, minor, patch, rc, post = match.groups()
     return int(major), int(minor), int(patch), int(post or 0), int(rc or 0)
 
 
 def format_version(major: int, minor: int, patch: int, post: int = 0, rc: int = 0) -> str:
     """Format version components into a version string.
-    
+
     Args:
         major: Major version number
-        minor: Minor version number  
+        minor: Minor version number
         patch: Patch version number
         post: Post-release number
         rc: RC number
-        
+
     Returns:
         Formatted version string
     """
@@ -59,31 +59,31 @@ def format_version(major: int, minor: int, patch: int, post: int = 0, rc: int =
 
 def git_tag_to_pep440(git_tag: str) -> str:
     """Convert git tag format to PEP440 format.
-    
+
     Args:
         git_tag: Git tag (e.g., "v1.3.1", "v1.3.1-post1")
-        
+
     Returns:
         PEP440 version string (e.g., "1.3.1", "1.3.1.post1")
     """
     # Remove 'v' prefix if present
     version = git_tag[1:] if git_tag.startswith('v') else git_tag
-    
+
     if "-post" in version:
         assert 'rc' not in version
         version = version.replace("-post", ".post")
     elif '-rc' in version:
         version = version.replace("-rc", "rc")
-        
+
     return version
 
 
 def pep440_to_git_tag(version: str) -> str:
     """Convert PEP440 version to git tag format.
-    
+
     Args:
         version: PEP440 version string (e.g., "1.3.1.post1" or "1.3.1rc2")
-        
+
     Returns:
         Git tag format (e.g., "v1.3.1-post1")
     """
@@ -98,7 +98,7 @@ def pep440_to_git_tag(version: str) -> str:
 
 def get_current_version() -> Optional[str]:
     """Get the current version from git tags.
-    
+
     Returns:
         Current version string or None if no tags exist
     """
@@ -149,16 +149,21 @@ def strip_post_from_version(version: str) -> str:
     return re.sub(r"[\.-]post[0-9]+", "", version)
 
 
-def get_git_describe(repo_path: Optional[pathlib.Path] = None) -> Optional[str]:
+def get_git_describe(repo_path: Optional[pathlib.Path] = None, since_major=False, since_minor=False) -> Optional[str]:
     """Get git describe output for version determination.
-    
+
     Returns:
         Git describe output or None if no tags exist
     """
     cwd = repo_path if repo_path is not None else None
+    pattern="v*.*.*"
+    if since_major:
+        pattern="v*.0.0"
+    elif since_minor:
+        pattern="v*.*.0"
     try:
         result = subprocess.run(
-            ["git", "describe", "--tags", "--long", "--match", "v*.*.*"],
+            ["git", "describe", "--tags", "--long", "--match", pattern],
             capture_output=True,
             text=True,
             check=True,
@@ -167,4 +172,4 @@ def get_git_describe(repo_path: Optional[pathlib.Path] = None) -> Optional[str]:
         result.check_returncode()
         return result.stdout.strip()
     except FileNotFoundError:
-        raise RuntimeError("git executable can't be found")
+        raise RuntimeError("git executable can't be found")

duckdb_packaging/build_backend.py

@@ -29,7 +29,7 @@
 )
 
 from duckdb_packaging._versioning import create_git_tag, pep440_to_git_tag, get_git_describe, strip_post_from_version
-from duckdb_packaging.setuptools_scm_version import forced_version_from_env
+from duckdb_packaging.setuptools_scm_version import forced_version_from_env, MAIN_BRANCH_VERSIONING
 
 
 _DUCKDB_VERSION_FILENAME = "duckdb_version.txt"
@@ -41,7 +41,7 @@
 
 def _log(msg: str, is_error: bool=False) -> None:
     """Log a message with build backend prefix.
-    
+
     Args:
         msg: The message to log.
         is_error: If True, log to stderr; otherwise log to stdout.
@@ -51,7 +51,7 @@ def _log(msg: str, is_error: bool=False) -> None:
 
 def _in_git_repository() -> bool:
     """Check if the current directory is inside a git repository.
-    
+
     Returns:
         True if .git directory exists, False otherwise.
     """
@@ -129,7 +129,7 @@ def _skbuild_config_add(
         key: str, value: Union[List, str], config_settings: Dict[str, Union[List[str],str]], fail_if_exists: bool=False
 ):
     """Add or modify a configuration setting for scikit-build-core.
-    
+
     This function handles adding values to scikit-build-core configuration settings,
     supporting both string and list types with appropriate merging behavior.
 
@@ -145,7 +145,7 @@ def _skbuild_config_add(
 
     Behavior Rules:
         - String value + list setting: value is appended to the list
-        - String value + string setting: existing value is overridden  
+        - String value + string setting: existing value is overridden
         - List value + list setting: existing list is extended
         - List value + string setting: raises RuntimeError
 
@@ -180,18 +180,18 @@ def _skbuild_config_add(
 
 def build_sdist(sdist_directory: str, config_settings: Optional[Dict[str, Union[List[str],str]]] = None) -> str:
     """Build a source distribution using the DuckDB submodule.
-    
+
     This function extracts the DuckDB version from either the git submodule and saves it
     to a version file before building the sdist with scikit-build-core. If _FORCED_PEP440_VERSION
     was set then we first create a tag on the submodule.
-    
+
     Args:
         sdist_directory: Directory where the sdist will be created.
         config_settings: Optional build configuration settings.
-        
+
     Returns:
         The filename of the created sdist.
-        
+
     Raises:
         RuntimeError: If not in a git repository or DuckDB submodule issues.
     """
@@ -201,7 +201,7 @@ def build_sdist(sdist_directory: str, config_settings: Optional[Dict[str, Union[
     if _FORCED_PEP440_VERSION is not None:
         duckdb_version = pep440_to_git_tag(strip_post_from_version(_FORCED_PEP440_VERSION))
     else:
-        duckdb_version = get_git_describe(repo_path=submodule_path)
+        duckdb_version = get_git_describe(repo_path=submodule_path, since_minor=MAIN_BRANCH_VERSIONING)
     _write_duckdb_long_version(duckdb_version)
     return skbuild_build_sdist(sdist_directory, config_settings=config_settings)
 
@@ -212,19 +212,19 @@ def build_wheel(
         metadata_directory: Optional[str] = None,
 ) -> str:
     """Build a wheel from either git submodule or extracted sdist sources.
-    
+
     This function builds a wheel using scikit-build-core, handling two scenarios:
     1. In a git repository: builds directly from the DuckDB submodule
     2. In an sdist: reads the saved DuckDB version and passes it to CMake
-    
+
     Args:
         wheel_directory: Directory where the wheel will be created.
         config_settings: Optional build configuration settings.
         metadata_directory: Optional directory for metadata preparation.
-        
+
     Returns:
         The filename of the created wheel.
-        
+
     Raises:
         RuntimeError: If not in a git repository or sdist environment.
     """
@@ -259,4 +259,4 @@ def build_wheel(
     "get_requires_for_build_editable",
     "prepare_metadata_for_build_wheel",
     "prepare_metadata_for_build_editable",
-]
+]

duckdb_packaging/setuptools_scm_version.py

@@ -27,22 +27,22 @@ def _main_branch_versioning():
 def version_scheme(version: Any) -> str:
     """
     setuptools_scm version scheme that matches DuckDB's original behavior.
-    
+
     Args:
         version: setuptools_scm version object
-        
+
     Returns:
         PEP440 compliant version string
     """
     print(f"[version_scheme] version object: {version}")
     print(f"[version_scheme] version.tag: {version.tag}")
     print(f"[version_scheme] version.distance: {version.distance}")
     print(f"[version_scheme] version.dirty: {version.dirty}")
-    
+
     # Handle case where tag is None
     if version.tag is None:
         raise ValueError("Need a valid version. Did you set a fallback_version in pyproject.toml?")
-    
+
     try:
         return _bump_version(str(version.tag), version.distance, version.dirty)
     except Exception as e: