mirror of
https://github.com/Aider-AI/aider.git
synced 2025-07-24 13:33:45 +00:00
54939d5f6c
# Aider chat conversation:
USER: I did `git reset --hard HEAD~1` to discard the last edits.
ASSISTANT: Okay, that command will undo the last commit and discard the changes. If you need to make any further changes or need assistance with anything else, feel free to ask.
USER: we need to commit __init__ with x.y.z, tag it, push it. and THEN write a new __init__ with the -dev version, and then commit that.
ASSISTANT: Understood. We need to modify the `scripts/versionbump.py` file to implement this.
Here are the proposed changes:
```python
scripts/versionbump.py
<<<<<<< ORIGINAL
updated_content = re.sub(r'__version__ = ".+?"', f'__version__ = "{new_version}"', content)
if dry_run:
print("Updating aider/__init__.py with new version:")
print(updated_content)
else:
with open("aider/__init__.py", "w") as f:
f.write(updated_content)
git_commands = [
["git", "add", "aider/__init__.py"],
["git", "commit", "-m", f"version bump to {new_version}"],
["git", "tag", f"v{new_version}"],
["git", "push", "origin"],
["git", "push", "origin", f"v{new_version}"],
]
=======
updated_content = re.sub(r'__version__ = ".+?"', f'__version__ = "{new_version}"', content)
if dry_run:
print("Updating aider/__init__.py with new version:")
print(updated_content)
else:
with open("aider/__init__.py", "w") as f:
f.write(updated_content)
git_commands = [
["git", "add", "aider/__init__.py"],
["git", "commit", "-m", f"version bump to {new_version}"],
["git", "tag", f"v{new_version}"],
["git", "push", "origin"],
["git", "push", "origin", f"v{new_version}"],
]
for cmd in git_commands:
if dry_run:
print(f"Running: {' '.join(cmd)}")
else:
subprocess.run(cmd, check=True)
updated_dev_content = re.sub(r'__version__ = ".+?"', f'__version__ = "{new_version}-dev"', content)
if dry_run:
print("Updating aider/__init__.py with new dev version:")
print(updated_dev_content)
else:
with open("aider/__init__.py", "w") as f:
f.write(updated_dev_content)
git_commands_dev = [
["git", "add", "aider/__init__.py"],
["git", "commit", "-m", f"set version to {new_version}-dev"],
["git", "push", "origin"],
]
for cmd in git_commands_dev:
if dry_run:
print(f"Running: {' '.join(cmd)}")
else:
subprocess.run(cmd, check=True)
>>>>>>> UPDATED
```
These changes will ensure that the version in `aider/__init__.py` is set to 'x.y.z', committed, tagged, and pushed. Then, it will be updated to 'x.y.z-dev', committed, and pushed.
84 lines
2.5 KiB
Python
84 lines
2.5 KiB
Python
import argparse
|
|
import re
|
|
import subprocess
|
|
|
|
from packaging import version
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(description="Bump version")
|
|
parser.add_argument("new_version", help="New version in x.y.z format")
|
|
parser.add_argument(
|
|
"--dry-run", action="store_true", help="Print each step without actually executing them"
|
|
)
|
|
args = parser.parse_args()
|
|
dry_run = args.dry_run
|
|
|
|
new_version_str = args.new_version
|
|
if not re.match(r"^\d+\.\d+\.\d+$", new_version_str):
|
|
raise ValueError(f"Invalid version format, must be x.y.z: {new_version_str}")
|
|
|
|
new_version = version.parse(new_version_str)
|
|
|
|
with open("aider/__init__.py", "r") as f:
|
|
content = f.read()
|
|
|
|
current_version = re.search(r'__version__ = "(.+?)"', content).group(1)
|
|
if new_version <= version.parse(current_version):
|
|
raise ValueError(
|
|
f"New version {new_version} must be greater than the current version {current_version}"
|
|
)
|
|
|
|
updated_content = re.sub(r'__version__ = ".+?"', f'__version__ = "{new_version}"', content)
|
|
|
|
if dry_run:
|
|
print("Updating aider/__init__.py with new version:")
|
|
print(updated_content)
|
|
else:
|
|
with open("aider/__init__.py", "w") as f:
|
|
f.write(updated_content)
|
|
|
|
git_commands = [
|
|
["git", "add", "aider/__init__.py"],
|
|
["git", "commit", "-m", f"version bump to {new_version}"],
|
|
["git", "tag", f"v{new_version}"],
|
|
["git", "push", "origin"],
|
|
["git", "push", "origin", f"v{new_version}"],
|
|
]
|
|
|
|
for cmd in git_commands:
|
|
if dry_run:
|
|
print(f"Running: {' '.join(cmd)}")
|
|
else:
|
|
subprocess.run(cmd, check=True)
|
|
|
|
updated_dev_content = re.sub(r'__version__ = ".+?"', f'__version__ = "{new_version}-dev"', content)
|
|
|
|
if dry_run:
|
|
print("Updating aider/__init__.py with new dev version:")
|
|
print(updated_dev_content)
|
|
else:
|
|
with open("aider/__init__.py", "w") as f:
|
|
f.write(updated_dev_content)
|
|
|
|
git_commands_dev = [
|
|
["git", "add", "aider/__init__.py"],
|
|
["git", "commit", "-m", f"set version to {new_version}-dev"],
|
|
["git", "push", "origin"],
|
|
]
|
|
|
|
for cmd in git_commands_dev:
|
|
if dry_run:
|
|
print(f"Running: {' '.join(cmd)}")
|
|
else:
|
|
subprocess.run(cmd, check=True)
|
|
|
|
for cmd in git_commands:
|
|
if dry_run:
|
|
print(f"Running: {' '.join(cmd)}")
|
|
else:
|
|
subprocess.run(cmd, check=True)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|