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.

Sign up for GitHub

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

Jump to bottom

python3 fix #1482

Merged
merged 2 commits into from May 13, 2018
Merged

python3 fix #1482

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19375fe
python3 fix
theromis Apr 8, 2018
87c74b0
lignup
theromis Apr 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/fpm/package/python.rb
View file
Open in desktop
Expand Up @@ -229,7 +229,7 @@ def load_package_info(setup_py)

if !attributes[:no_auto_depends?] and attributes[:python_dependencies?]
metadata["dependencies"].each do |dep|
dep_re = /^([^<>!= ]+)\s*(?:([<>!=]{1,2})\s*(.*))?$/
dep_re = /^([^<>!= ]+)\s*(?:([~<>!=]{1,2})\s*(.*))?$/
match = dep_re.match(dep)
if match.nil?
logger.error("Unable to parse dependency", :dependency => dep)
Expand All @@ -240,7 +240,7 @@ def load_package_info(setup_py)
next if attributes[:python_disable_dependency].include?(name)

# convert == to =
if cmp == "=="
if cmp == "==" or cmp == "~="
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://www.python.org/dev/peps/pep-0508/#grammar

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it still not clear to me what wrong with this code?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, if you want me to change something just please give me to know,
this change been done just because of python azure 3.0.0 module

logger.info("Converting == dependency requirement to =", :dependency => dep )
cmp = "="
end
Expand Down