Skip to content

Commit 1abf2a1

Browse files
committed
Resolve merge conflict by keeping README.md file
2 parents 35bce23 + 520ba91 commit 1abf2a1

File tree

3 files changed

+64
-150
lines changed

3 files changed

+64
-150
lines changed

.github/workflows/release.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,17 @@ jobs:
140140
- name: Generate Release Notes
141141
id: generate_notes
142142
run: |
143+
<<<<<<< HEAD
143144
echo "## What's New" > release-notes.md
145+
=======
146+
echo "## Public Beta Release" > release-notes.md
147+
echo "" >> release-notes.md
148+
echo "We’re excited to announce the release of **AutoCommit v0.1.10**! 🎉 This version marks a significant milestone as it brings compatibility with both **Windows** and **Linux**, making the tool accessible to a wider range of developers." >> release-notes.md
149+
echo "" >> release-notes.md
150+
echo "### Features" >> release-notes.md
151+
echo "- **Cross-Platform Support**: Fully compatible with both **Windows** and **Linux**." >> release-notes.md
152+
echo "- **New Alias**: Use \`act\` as the shorthand for \`autocommit\`." >> release-notes.md
153+
>>>>>>> main
144154
echo "" >> release-notes.md
145155
echo "### Improvements" >> release-notes.md
146156
echo "- Shifted to `uv` for package management" >> release-notes.md

README.md

Lines changed: 0 additions & 150 deletions
This file was deleted.

setup.py

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
from setuptools import setup, find_packages
2+
import sys
3+
4+
# Read the contents of your README file
5+
with open('README.md', 'r', encoding='utf-8') as f:
6+
long_des = f.read()
7+
8+
# Conditional dependencies for platform-specific requirements
9+
platform_specific_requires = []
10+
if sys.platform == "win32":
11+
platform_specific_requires.append("pyreadline3")
12+
13+
setup(
14+
name="autocommitt",
15+
version="v0.1.10",
16+
author="Anish Dabhane",
17+
author_email="[email protected]",
18+
description="A CLI tool for generating editable commit messages locally using Ollama.",
19+
long_description=long_des,
20+
long_description_content_type='text/markdown',
21+
packages=find_packages(),
22+
install_requires=[
23+
"ollama",
24+
"typer",
25+
"requests",
26+
"platformdirs",
27+
"psutil",
28+
] + platform_specific_requires,
29+
keywords=[
30+
"autocommit",
31+
"aicommit",
32+
"git automation",
33+
"CLI tool",
34+
"local AI",
35+
],
36+
classifiers=[
37+
"Development Status :: 4 - Beta",
38+
"Intended Audience :: Developers",
39+
"Programming Language :: Python :: 3",
40+
"Operating System :: Unix",
41+
"Operating System :: Microsoft :: Windows :: Windows 10",
42+
"Operating System :: Microsoft :: Windows :: Windows 11",
43+
"Operating System :: MacOS"
44+
],
45+
entry_points={
46+
"console_scripts": [
47+
"autocommitt = autocommitt.cli.main:app",
48+
"act = autocommitt.cli.main:app"
49+
]
50+
},
51+
url="https://github.com/Spartan-71/autocommitt", # Update with your actual URL
52+
license="Apache-2.0", # Specify your license type
53+
python_requires='>=3.10', # Specify the minimum Python version required
54+
)

0 commit comments

Comments
 (0)