Skip to content

Commit edeaad5

Browse files
committed
ci-bump-version
1 parent 8f3c024 commit edeaad5

3 files changed

Lines changed: 22 additions & 15 deletions

File tree

codeconcat/__init__.py

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
11
# -*- coding: utf-8 -*-
22
# codeconcat/__init__.py
3-
try:
3+
import sys
4+
5+
__version__ = "0.0.0-unknown" # Default
6+
7+
if sys.version_info >= (3, 8):
8+
# Use importlib.metadata for Python 3.8+
49
from importlib.metadata import PackageNotFoundError, version
510

611
try:
712
__version__ = version("codeconcat")
813
except PackageNotFoundError:
914
# Package is not installed, perhaps running from source
10-
__version__ = "0.0.0-dev"
11-
except ImportError:
12-
# Fallback for Python < 3.8
13-
import pkg_resources
14-
15+
__version__ = "0.0.0-dev (importlib)"
16+
else:
17+
# Use pkg_resources for Python < 3.8
1518
try:
16-
__version__ = pkg_resources.get_distribution("codeconcat").version
17-
except pkg_resources.DistributionNotFound:
18-
__version__ = "0.0.0-dev"
19+
import pkg_resources
20+
21+
try:
22+
__version__ = pkg_resources.get_distribution("codeconcat").version
23+
except pkg_resources.DistributionNotFound:
24+
__version__ = "0.0.0-dev (pkg_resources)"
25+
except ImportError:
26+
# pkg_resources might not be installed either in very minimal environments
27+
__version__ = "0.0.0-dev (pkg_resources import failed)"
28+
1929

2030
# You can also import key functions here if you want them accessible like:
2131
# from .main import main

codeconcat/main.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ def parse_arguments() -> argparse.Namespace:
2020
"""Parses command line arguments."""
2121
parser = argparse.ArgumentParser(
2222
description=(
23-
"Concatenate files from a directory into a single output, "
24-
"respecting .gitignore and config files."
23+
"Concatenate files from a directory into a single output, respecting .gitignore and config files."
2524
),
2625
formatter_class=argparse.ArgumentDefaultsHelpFormatter, # Show defaults
2726
)

codeconcat/output.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,10 @@ def create_output(
6363
output_stream.write("\n\n")
6464
# --- End of Formatting Change ---
6565

66-
logger.info(
67-
f"Successfully wrote {len(tree)} files to " f"{'stdout' if to_stdout else output_path_str}"
68-
)
66+
logger.info(f"Successfully wrote {len(tree)} files to {'stdout' if to_stdout else output_path_str}")
6967

7068
except OSError as e:
71-
logger.error(f"Error writing to output {'stdout' if to_stdout else output_path_str}. " f"Error: {e}")
69+
logger.error(f"Error writing to output {'stdout' if to_stdout else output_path_str}. Error: {e}")
7270
except Exception as e:
7371
logger.error(f"An unexpected error occurred during output generation: {e}")
7472
finally:

0 commit comments

Comments
 (0)