Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge dev to main #485

Merged
merged 4 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions operators/cluster_embeddings/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,19 @@
name = "feluda-cluster-embeddings"
version = "0.1.0"
requires-python = ">=3.10"
dependencies = [
"scikit-learn>=1.5.1",
"numpy>=2.2.1",
]
dependencies = ["scikit-learn>=1.6.0", "numpy>=2.2.1"]

[build-system]
requires = [
"hatchling",
]
requires = ["hatchling"]
build-backend = "hatchling.build"

[tool.semantic_release]
version_variable = [
"pyproject.toml:project.version",
]
version_variable = ["pyproject.toml:project.version"]

[tool.semantic_release.branches.main]
match = "main"
prerelease = false
tag_format = "{name}-{version}"

[tool.hatch.build.targets.wheel]
packages = [
".",
]
packages = ["."]
17 changes: 4 additions & 13 deletions operators/dimension_reduction/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,19 @@
name = "feluda-dimension-reduction"
version = "0.1.0"
requires-python = ">=3.10"
dependencies = [
"scikit-learn>=1.5.1",
"numpy>=2.2.1",
]
dependencies = ["scikit-learn>=1.6.0", "numpy>=2.2.1"]

[build-system]
requires = [
"hatchling",
]
requires = ["hatchling"]
build-backend = "hatchling.build"

[tool.semantic_release]
version_variable = [
"pyproject.toml:project.version",
]
version_variable = ["pyproject.toml:project.version"]

[tool.semantic_release.branches.main]
match = "main"
prerelease = false
tag_format = "{name}-{version}"

[tool.hatch.build.targets.wheel]
packages = [
".",
]
packages = ["."]
14 changes: 4 additions & 10 deletions operators/vid_vec_rep_clip/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,21 @@ requires-python = ">=3.10"
dependencies = [
"torch>=2.5.1",
"torchvision>=0.20.1",
"transformers>=4.44.0",
"transformers>=4.47.1",
"pillow>=11.1.0",
]

[build-system]
requires = [
"hatchling",
]
requires = ["hatchling"]
build-backend = "hatchling.build"

[tool.semantic_release]
version_variable = [
"pyproject.toml:project.version",
]
version_variable = ["pyproject.toml:project.version"]

[tool.semantic_release.branches.main]
match = "main"
prerelease = false
tag_format = "{name}-{version}"

[tool.hatch.build.targets.wheel]
packages = [
".",
]
packages = ["."]
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.9.0"
readme = "README.md"
requires-python = ">=3.10"
dependencies = [
"boto3>=1.35.91",
"boto3>=1.35.92",
"dacite>=1.8.1",
"pydub>=0.25.1",
"pyyaml>=6.0.2",
Expand Down
42 changes: 26 additions & 16 deletions scripts/semantic_release_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,25 +201,35 @@ def get_package_commits(self, package_path):
Git command runs successfully, and commits are returned.
Failure Path:
Git command fails due to invalid commit range or other issues.
TODO: Handle git log when its empty
TODO: handle cases when prev commit and current commit is the same
"""
try:
# Get commits that modified files in this package between two commits
cmd = [
"git",
"log",
f"{self.prev_commit}^..{self.current_commit}",
"--pretty=format:%s",
"--",
package_path,
]
paths_to_check = [package_path]

# Special handling for feluda package to include root pyproject.toml
if package_path == "feluda":
paths_to_check.append("pyproject.toml")

all_commits = []
for path in paths_to_check:
# Get commits that modified files in this path between two commits
cmd = [
"git",
"log",
f"{self.prev_commit}^..{self.current_commit}",
"--pretty=format:%s",
"--",
path,
]

result = subprocess.run(
cmd, cwd=self.repo_root, capture_output=True, text=True, check=True
)

result = subprocess.run(
cmd, cwd=self.repo_root, capture_output=True, text=True, check=True
)
# Add commits for this path to the total list
all_commits.extend(result.stdout.splitlines())

return result.stdout.splitlines()
# Remove duplicates while preserving order
return list(dict.fromkeys(all_commits))
except subprocess.CalledProcessError as e:
print(f"Error getting commits for {package_path}: {e}")
return []
Expand Down Expand Up @@ -547,4 +557,4 @@ def update_package_versions(self):

except Exception as e:
print(f"An error occurred during the version update process: {e}")
sys.exit(1)
sys.exit(1)
Loading