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.

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

Sync dist_utils.py with latest from st2 repo #16

Merged
merged 3 commits into from Apr 29, 2020
Merged

Conversation

nmaludy
Copy link
Member

@nmaludy nmaludy commented Apr 29, 2020

Sync dist_utils.py with latest from st2 repo

Fix is related to: StackStorm/st2#4929

Fixes error in CI: https://travis-ci.org/github/StackStorm/st2/jobs/681137227

    ERROR: Command errored out with exit status 1:
     command: /home/travis/build/StackStorm/st2/virtualenv/bin/python2.7 -c 'import sys, setuptools, tokenize; sys.argv[0] = '"'"'/tmp/pip-install-BVwhVy/st2-auth-backend-flat-file/setup.py'"'"'; __file__='"'"'/tmp/pip-install-BVwhVy/st2-auth-backend-flat-file/setup.py'"'"';f=getattr(tokenize, '"'"'open'"'"', open)(__file__);code=f.read().replace('"'"'\r\n'"'"', '"'"'\n'"'"');f.close();exec(compile(code, __file__, '"'"'exec'"'"'))' egg_info --egg-base /tmp/pip-pip-egg-info-mhz4SU
         cwd: /tmp/pip-install-BVwhVy/st2-auth-backend-flat-file/
    Complete output (7 lines):
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
      File "/tmp/pip-install-BVwhVy/st2-auth-backend-flat-file/setup.py", line 32, in <module>
        install_reqs, dep_links = fetch_requirements(REQUIREMENTS_FILE)
      File "dist_utils.py", line 74, in fetch_requirements
        if req.link:
    AttributeError: 'ParsedRequirement' object has no attribute 'link'
    ----------------------------------------
ERROR: Command errored out with exit status 1: python setup.py egg_info Check the logs for full command output.

@nmaludy nmaludy added the bug label Apr 29, 2020
@nmaludy nmaludy requested review from Kami, blag and arm4b April 29, 2020 19:07
@nmaludy nmaludy self-assigned this Apr 29, 2020
@nmaludy
Copy link
Member Author

nmaludy commented Apr 29, 2020

Added a bug fix from linting about a "bare except" statement. I changed this to catch the base Exception instead.

https://travis-ci.org/github/StackStorm/st2-auth-backend-pam/jobs/681165316#L280

st2auth_pam_backend/pam_backend.py:69:9: E722 do not use bare 'except'

@nmaludy nmaludy merged commit 0c43a94 into master Apr 29, 2020
@nmaludy nmaludy deleted the bugfix/sync-distutils branch April 29, 2020 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants