Skip to content

Commit 9f2dd90

Browse files
authored
SW-1182 remove repo and user from dependency archive format (mrbeam#34)
* Remove repo and user from dependency archive format * Change regex for dependencies to match pep-440
1 parent c5edbb4 commit 9f2dd90

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

octoprint_netconnectd/scripts/update_script.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def get_dependencies(path):
122122
list of dependencie dict [{"name", "version"}]
123123
"""
124124
dependencies_path = os.path.join(path, "dependencies.txt")
125-
dependencies_pattern = r"([a-z]+(?:[_-][a-z]+)*)(.=)+((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"
125+
dependencies_pattern = r"([a-z]+(?:[_-][a-z]+)*)(.=)+(([1-9][0-9]*!)?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))*((a|b|rc)(0|[1-9][0-9]*))?(\.post(0|[1-9][0-9]*))?(\.dev(0|[1-9][0-9]*))?)"
126126
"""
127127
Example:
128128
input: iobeam==0.7.15
@@ -281,8 +281,6 @@ def build_queue(update_info, dependencies, plugin_archive):
281281
)
282282
if dependency_config.get("pip"):
283283
archive = dependency_config["pip"].format(
284-
repo=dependency_config["repo"],
285-
user=dependency_config["user"],
286284
target_version="v{version}".format(version=dependency["version"]),
287285
)
288286
else:

0 commit comments

Comments
 (0)