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.

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

python3 fix #1482

Merged
merged 2 commits into from May 13, 2018

Conversation

Projects
None yet
3 participants
@theromis
Contributor

theromis commented Apr 8, 2018

fixes azure 3.0.0 build

theromis added some commits Apr 8, 2018

@@ -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 == "~="

This comment has been minimized.

This comment has been minimized.

@theromis

theromis May 7, 2018

Contributor

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

This comment has been minimized.

@theromis

theromis May 7, 2018

Contributor

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

@penguinolog

This comment has been minimized.

Contributor

penguinolog commented May 7, 2018

@jordansissel

This comment has been minimized.

Owner

jordansissel commented May 13, 2018

This change looks OK to me. I tested manually, and was successful

  • Known failure that this PR fixes:
% fpm --version
1.9.3
% fpm -s python -t rpm --python-bin =python3 -v 3.0.0 azure
Unable to parse dependency {:dependency=>"azure-mgmt ~= 2.0", :level=>:error}
Invalid package configuration: Invalid dependency 'azure-mgmt ~= 2.0' {:level=>:error}
  • Testing on this PR:
⓿ pork(~/projects/fpm) pull/1482
% bin/fpm -s python -t rpm --python-bin =python3 -v 3.0.0 azure
Created package {:path=>"python-azure-3.0.0-1.noarch.rpm"}

This seems successful.


One thing that confused me is that the azure egg has no files. This seems correct.

% rpm -qlp python-azure-3.0.0-1.noarch.rpm
/usr/local/lib/python3.6/site-packages/azure-3.0.0-py3.6.egg-info/PKG-INFO
/usr/local/lib/python3.6/site-packages/azure-3.0.0-py3.6.egg-info/SOURCES.txt
/usr/local/lib/python3.6/site-packages/azure-3.0.0-py3.6.egg-info/dependency_links.txt
/usr/local/lib/python3.6/site-packages/azure-3.0.0-py3.6.egg-info/not-zip-safe
/usr/local/lib/python3.6/site-packages/azure-3.0.0-py3.6.egg-info/requires.txt
/usr/local/lib/python3.6/site-packages/azure-3.0.0-py3.6.egg-info/top_level.txt

That said, I compared this to the azure-3.0.0.zip from https://pypi.org/project/azure/#files, and it also doesn't have any python files:

% unzip azure-3.0.0.zip
Archive:  azure-3.0.0.zip
  inflating: azure-3.0.0/README.rst
  inflating: azure-3.0.0/setup.py
  inflating: azure-3.0.0/setup.cfg
  inflating: azure-3.0.0/PKG-INFO
  inflating: azure-3.0.0/azure.egg-info/top_level.txt
  inflating: azure-3.0.0/azure.egg-info/not-zip-safe
  inflating: azure-3.0.0/azure.egg-info/requires.txt
  inflating: azure-3.0.0/azure.egg-info/PKG-INFO
  inflating: azure-3.0.0/azure.egg-info/dependency_links.txt
  inflating: azure-3.0.0/azure.egg-info/SOURCES.txt

Based on the above, I believe this PR is correct.

@jordansissel jordansissel merged commit 1d04b94 into jordansissel:master May 13, 2018

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment