Merge branch 'fix/deps_folder' into 'master'

Resolve deps folder conflict in system path See merge request app-frameworks/esp-rainmaker-cli!54
espressif · Jan 8, 2025 · c0ebd74 · c0ebd74
2 parents 19c13da + dc8bead
commit c0ebd74
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/deps/__init__.py → rmaker_deps/__init__.py b/deps/__init__.py → rmaker_deps/__init__.py
diff --git a/deps/nvs_partition_gen.py → rmaker_deps/nvs_partition_gen.py b/deps/nvs_partition_gen.py → rmaker_deps/nvs_partition_gen.py
diff --git a/rmaker_tools/rmaker_claim/claim.py b/rmaker_tools/rmaker_claim/claim.py
@@ -40,7 +40,7 @@
 import esptool
 from esp_secure_cert.tlv_format import tlv_priv_key_t, tlv_priv_key_type_t, generate_partition_no_ds
 
-from deps import nvs_partition_gen
+from rmaker_deps import nvs_partition_gen
 
 CURR_DIR = os.path.dirname(__file__)
 CERT_FILE = os.path.abspath(os.path.join(CURR_DIR, os.pardir, os.pardir, 'server_cert/server_cert.pem'))

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def get_install_requires():
     )
     exit(1)
 
-VERSION = "1.1.1"
+VERSION = "1.1.2"
 
 long_description = """
 =================