Compare commits
No commits in common. "main" and "subclasses" have entirely different histories.
main
...
subclasses
21
Makefile
21
Makefile
@ -37,27 +37,6 @@ verify-tag-version:
|
|||||||
$(eval TAG_NAME = $(shell [ -n "$(DRONE_TAG)" ] && echo $(DRONE_TAG) || git describe --tags --exact-match))
|
$(eval TAG_NAME = $(shell [ -n "$(DRONE_TAG)" ] && echo $(DRONE_TAG) || git describe --tags --exact-match))
|
||||||
test "v$(shell poetry version | awk '{print $$2}')" = "$(TAG_NAME)"
|
test "v$(shell poetry version | awk '{print $$2}')" = "$(TAG_NAME)"
|
||||||
|
|
||||||
.PHONY: bump-patch
|
|
||||||
bump-patch:
|
|
||||||
$(eval NEW_VERSION = $(shell poetry version patch | awk '{print $$6}'))
|
|
||||||
git add pyproject.toml
|
|
||||||
git commit -m "Bump version to $(NEW_VERSION)"
|
|
||||||
git tag "v$(NEW_VERSION)"
|
|
||||||
|
|
||||||
.PHONY: bump-minor
|
|
||||||
bump-minor:
|
|
||||||
$(eval NEW_VERSION = $(shell poetry version minor | awk '{print $$6}'))
|
|
||||||
git add pyproject.toml
|
|
||||||
git commit -m "Bump version to $(NEW_VERSION)"
|
|
||||||
git tag "v$(NEW_VERSION)"
|
|
||||||
|
|
||||||
.PHONY: bump-major
|
|
||||||
bump-major:
|
|
||||||
$(eval NEW_VERSION = $(shell poetry version major | awk '{print $$6}'))
|
|
||||||
git add pyproject.toml
|
|
||||||
git commit -m "Bump version to $(NEW_VERSION)"
|
|
||||||
git tag "v$(NEW_VERSION)"
|
|
||||||
|
|
||||||
# Upload to pypi
|
# Upload to pypi
|
||||||
.PHONY: upload
|
.PHONY: upload
|
||||||
upload: verify-tag-version build
|
upload: verify-tag-version build
|
||||||
|
@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
|
|||||||
|
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "unhacs"
|
name = "unhacs"
|
||||||
version = "0.7.1"
|
version = "0.6.2"
|
||||||
description = "Command line interface to install Home Assistant Community Store packages"
|
description = "Command line interface to install Home Assistant Community Store packages"
|
||||||
authors = ["Ian Fijolek <ian@iamthefij.com>"]
|
authors = ["Ian Fijolek <ian@iamthefij.com>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
@ -17,7 +17,6 @@ pyyaml = "^6.0.0"
|
|||||||
|
|
||||||
[tool.poetry.group.dev.dependencies]
|
[tool.poetry.group.dev.dependencies]
|
||||||
black = "^24.4.2"
|
black = "^24.4.2"
|
||||||
isort = "^5.13.2"
|
|
||||||
mypy = "^1.10.0"
|
mypy = "^1.10.0"
|
||||||
pre-commit = "^3.7.1"
|
pre-commit = "^3.7.1"
|
||||||
types-requests = "^2.32.0"
|
types-requests = "^2.32.0"
|
||||||
|
@ -6,7 +6,6 @@ from pathlib import Path
|
|||||||
|
|
||||||
from unhacs.main import main
|
from unhacs.main import main
|
||||||
from unhacs.packages import get_installed_packages
|
from unhacs.packages import get_installed_packages
|
||||||
from unhacs.packages import read_lock_packages
|
|
||||||
|
|
||||||
INTEGRATION_URL = "https://github.com/simbaja/ha_gehome"
|
INTEGRATION_URL = "https://github.com/simbaja/ha_gehome"
|
||||||
INTEGRATION_VERSION = "v0.6.9"
|
INTEGRATION_VERSION = "v0.6.9"
|
||||||
@ -125,30 +124,6 @@ class TestMainIntegrarion(unittest.TestCase):
|
|||||||
self.assertEqual(installed[0].url, INTEGRATION_URL)
|
self.assertEqual(installed[0].url, INTEGRATION_URL)
|
||||||
self.assertEqual(installed[0].version, INTEGRATION_VERSION)
|
self.assertEqual(installed[0].version, INTEGRATION_VERSION)
|
||||||
|
|
||||||
# Delete the custom_components folder and re-install the integration using the lock file
|
|
||||||
shutil.rmtree(os.path.join(self.test_dir, "custom_components"))
|
|
||||||
self.run_itest(
|
|
||||||
"Re-install integration using lock file",
|
|
||||||
"add --file unhacs.yaml",
|
|
||||||
expected_files=[
|
|
||||||
"custom_components/ge_home/__init__.py",
|
|
||||||
"custom_components/ge_home/manifest.json",
|
|
||||||
"custom_components/ge_home/switch.py",
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
# Delete the lock file and then regenerate it
|
|
||||||
os.remove(os.path.join(self.test_dir, "unhacs.yaml"))
|
|
||||||
self.run_itest(
|
|
||||||
"Regenerate lock file",
|
|
||||||
"list --freeze",
|
|
||||||
expected_files=[
|
|
||||||
"unhacs.yaml",
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertGreater(len(read_lock_packages()), 0)
|
|
||||||
|
|
||||||
self.run_itest(
|
self.run_itest(
|
||||||
"Remove integration",
|
"Remove integration",
|
||||||
"remove ha_gehome --yes",
|
"remove ha_gehome --yes",
|
||||||
|
@ -5,6 +5,7 @@ from pathlib import Path
|
|||||||
|
|
||||||
from unhacs.git import get_repo_tags
|
from unhacs.git import get_repo_tags
|
||||||
from unhacs.packages import Package
|
from unhacs.packages import Package
|
||||||
|
from unhacs.packages import PackageType
|
||||||
from unhacs.packages import get_installed_packages
|
from unhacs.packages import get_installed_packages
|
||||||
from unhacs.packages import read_lock_packages
|
from unhacs.packages import read_lock_packages
|
||||||
from unhacs.packages import write_lock_packages
|
from unhacs.packages import write_lock_packages
|
||||||
@ -54,12 +55,6 @@ def parse_args(argv: list[str]):
|
|||||||
# List installed packages
|
# List installed packages
|
||||||
list_parser = subparsers.add_parser("list", description="List installed packages.")
|
list_parser = subparsers.add_parser("list", description="List installed packages.")
|
||||||
list_parser.add_argument("--verbose", "-v", action="store_true")
|
list_parser.add_argument("--verbose", "-v", action="store_true")
|
||||||
list_parser.add_argument(
|
|
||||||
"--freeze",
|
|
||||||
"-f",
|
|
||||||
action="store_true",
|
|
||||||
help="Regenerate unhacs.yaml with installed packages.",
|
|
||||||
)
|
|
||||||
|
|
||||||
# List git tags for a given package
|
# List git tags for a given package
|
||||||
list_tags_parser = subparsers.add_parser("tags", help="List tags for a package.")
|
list_tags_parser = subparsers.add_parser("tags", help="List tags for a package.")
|
||||||
@ -238,15 +233,11 @@ class Unhacs:
|
|||||||
|
|
||||||
self.write_lock_packages(packages)
|
self.write_lock_packages(packages)
|
||||||
|
|
||||||
def list_packages(self, verbose: bool = False, freeze: bool = False):
|
def list_packages(self, verbose: bool = False):
|
||||||
"""List installed packages and their versions."""
|
"""List installed packages and their versions."""
|
||||||
installed_packages = get_installed_packages()
|
for package in get_installed_packages():
|
||||||
for package in installed_packages:
|
|
||||||
print(package.verbose_str() if verbose else str(package))
|
print(package.verbose_str() if verbose else str(package))
|
||||||
|
|
||||||
if freeze:
|
|
||||||
self.write_lock_packages(installed_packages)
|
|
||||||
|
|
||||||
def list_tags(self, url: str, limit: int = 10):
|
def list_tags(self, url: str, limit: int = 10):
|
||||||
print(f"Tags for {url}:")
|
print(f"Tags for {url}:")
|
||||||
for tag in get_repo_tags(url)[-1 * limit :]:
|
for tag in get_repo_tags(url)[-1 * limit :]:
|
||||||
@ -352,7 +343,7 @@ def main(argv: list[str] | None = None) -> int:
|
|||||||
print("Either a file or a URL must be provided")
|
print("Either a file or a URL must be provided")
|
||||||
return 1
|
return 1
|
||||||
elif args.subcommand == "list":
|
elif args.subcommand == "list":
|
||||||
unhacs.list_packages(args.verbose, args.freeze)
|
unhacs.list_packages(args.verbose)
|
||||||
elif args.subcommand == "tags":
|
elif args.subcommand == "tags":
|
||||||
unhacs.list_tags(args.url, limit=args.limit)
|
unhacs.list_tags(args.url, limit=args.limit)
|
||||||
elif args.subcommand == "remove":
|
elif args.subcommand == "remove":
|
||||||
|
Loading…
Reference in New Issue
Block a user