-
Notifications
You must be signed in to change notification settings - Fork 23
Conversation
Adding "future" to our Jenkins nodes. Will retest afterwards |
retest this please |
The changes in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes in pnc_cli/swagger_client/api_client.py must also be done in templates
Also you can rebease it now as the other PR was merged.
from tasks import Tasks | ||
# import utils | ||
# from scm_utils import ScmInfo, get_scm_info | ||
# from tasks import Tasks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't comment out code, either keep it or remove it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch! We're actually using all those imports. It should be commented out
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
right. mistake. when you will remove the comment, you must change the import to conform to python 2 and python 3 rules at the same time (ATM it works only in python 2 but not in 3) - eg. "import utils" -> "from . import utils"
@janinko Please note I have no time for the requested changes as I've indicated via email. May be instead of requesting changes doing them directly would be quicker ? |
I'll try to do the necessary adjustments |
At this point, I think the best course of action to resolve the failure to rebase due to conflicts is to cherry-pick Petr's commit on top of version-1.4.x branch, and apply some changes on top to get the PR more easily rebased. I'll create another PR for it on Thursday hopefully. I'm keeping it open for now so that I remember :D |
@thescouser89 Big thanx for taking over ! |
PR created here: #134 Will close this PR. |
Checklist:
no
no
Initial python 3.x compatiblity.
Requires configparser library change from #130