From bb4b309f689abf55169925f2e96145d7eb7f37bc Mon Sep 17 00:00:00 2001 From: GingerAvalanche Date: Tue, 7 Feb 2023 13:29:08 -0800 Subject: [PATCH 1/5] Remove one last unused dependency --- pyproject.toml | 1 - requirements.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bd44e19..b888712 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,6 @@ dependencies = [ "pywebview==3.7.2", "requests~=2.27.1", "rstb>=1.2.2", - "xxhash~=3.2", ] requires-python = ">=3.7" classifiers = [ diff --git a/requirements.txt b/requirements.txt index 53c8717..81a01c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,3 @@ cefpython3~=66.1; platform_system == 'Windows' pywebview==3.7.2 requests~=2.26.0 rstb>=1.2.2 -xxhash~=3.2 From 7a3c230d12f42a3f02b933e1fd9929e64395aacc Mon Sep 17 00:00:00 2001 From: GingerAvalanche Date: Wed, 8 Feb 2023 01:19:15 -0800 Subject: [PATCH 2/5] Update dependencies Add xxhash back - it's still necessary for places I didn't notice before Update the oead dependency to ensure lifetime issue is always fixed Remove duplicate Linux dependency Alphabetize dependencies --- pyproject.toml | 8 ++++---- requirements.txt | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b888712..9c18c1f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,17 +11,17 @@ author_email = "macadamiadaze@gmail.com" license = { file = "docs/LICENSE.md" } dependencies = [ "botw-utils~=0.2.3", - "oead~=1.2.4", + "cefpython3~=66.1; platform_system == 'Windows'", + "oead~=1.2.6", "packaging~=21.3", "pythonnet~=3.0.1", "PyQt5; platform_system == 'Linux'", - "pyqtwebengine; platform_system == 'Linux'", - "QtPy; platform_system == 'Linux'", "pyqtwebengine~=5.15.2; platform_system == 'Linux'", - "cefpython3~=66.1; platform_system == 'Windows'", "pywebview==3.7.2", + "QtPy; platform_system == 'Linux'", "requests~=2.27.1", "rstb>=1.2.2", + "xxhash==3.2.0", ] requires-python = ">=3.7" classifiers = [ diff --git a/requirements.txt b/requirements.txt index 81a01c7..1917d2f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,12 @@ botw-utils~=0.2.3 -oead~=1.2.0 +cefpython3~=66.1; platform_system == 'Windows' +oead~=1.2.6 packaging~=21.3 pythonnet~=3.0.1 PyQt5; platform_system == 'Linux' pyqtwebengine; platform_system == 'Linux' -QtPy; platform_system == 'Linux' -cefpython3~=66.1; platform_system == 'Windows' pywebview==3.7.2 +QtPy; platform_system == 'Linux' requests~=2.26.0 rstb>=1.2.2 +xxhash==3.2.0 From 573c3d659cd6c57ed4bcf8498b32b7cdbf955a07 Mon Sep 17 00:00:00 2001 From: GingerAvalanche Date: Wed, 8 Feb 2023 22:39:14 -0800 Subject: [PATCH 3/5] upgrade.py: Add rules.txt conversion back in --- bcml/upgrade.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bcml/upgrade.py b/bcml/upgrade.py index 690c5aa..3d83423 100644 --- a/bcml/upgrade.py +++ b/bcml/upgrade.py @@ -33,6 +33,7 @@ def convert_old_mods(source: Path = None): def convert_old_mod(mod: Path, delete_old: bool = False): + rules_to_info(mod / "rules.txt", delete_old=delete_old) if (mod / "logs").exists(): info = parse_rules(mod / "rules.txt") convert_old_logs(mod, info["name"]) From 906c294044e463fe466b6b8c0ab0a9eda092659c Mon Sep 17 00:00:00 2001 From: GingerAvalanche Date: Wed, 8 Feb 2023 22:41:13 -0800 Subject: [PATCH 4/5] Loosen xxhash requirement again --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9c18c1f..6327d72 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ dependencies = [ "QtPy; platform_system == 'Linux'", "requests~=2.27.1", "rstb>=1.2.2", - "xxhash==3.2.0", + "xxhash~=3.2", ] requires-python = ">=3.7" classifiers = [ diff --git a/requirements.txt b/requirements.txt index 1917d2f..624d8b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,4 @@ pywebview==3.7.2 QtPy; platform_system == 'Linux' requests~=2.26.0 rstb>=1.2.2 -xxhash==3.2.0 +xxhash~=3.2 From f6aad2ff371037ba87322e902b746359156b8b19 Mon Sep 17 00:00:00 2001 From: GingerAvalanche Date: Wed, 8 Feb 2023 22:41:36 -0800 Subject: [PATCH 5/5] Version bump --- Cargo.toml | 2 +- bcml/__version__.py | 2 +- pyproject.toml | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6b71de6..58768c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bcml" authors = ["Caleb Smith"] -version = "3.10.7" +version = "3.10.8" edition = "2021" readme = "docs/README.md" diff --git a/bcml/__version__.py b/bcml/__version__.py index 26ea405..36eaf9d 100644 --- a/bcml/__version__.py +++ b/bcml/__version__.py @@ -1,6 +1,6 @@ _MAJOR=3 _MINOR=10 -_PATCH="7" +_PATCH="8" VERSION = f"{_MAJOR}.{_MINOR}.{_PATCH}" USER_VERSION = f"""{_MAJOR}.{_MINOR}.{_PATCH[0:1]} { diff --git a/pyproject.toml b/pyproject.toml index 6327d72..293bbe4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "bcml" -version = "3.10.7" +version = "3.10.8" description = "A mod manager for The Legend of Zelda: Breath of the Wild" author = "NiceneNerd" author_email = "macadamiadaze@gmail.com" diff --git a/setup.py b/setup.py index 9d06063..90abb73 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name="bcml", - version="3.10.7", + version="3.10.8", author="NiceneNerd", author_email="macadamiadaze@gmail.com", description="A mod manager for The Legend of Zelda: Breath of the Wild",