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

AspectList: Connect with holder bear #4490

Merged
merged 2 commits into from Jul 24, 2017

Conversation

@adhikasp
Copy link
Member

adhikasp commented Jul 20, 2017

Replacement of #4111
Closes #4094

@adhikasp adhikasp changed the title Issue 4094 AspectList: Connect aspectlist with holder bear Jul 20, 2017

@adhikasp

This comment has been minimized.

Copy link
Member Author

adhikasp commented Jul 20, 2017

Accidentally push enter :(

Anyway, I was trying to keep the original @pratyushprakash commit but there is many rebase and logic conflict so I modify them.

@adhikasp adhikasp changed the title AspectList: Connect aspectlist with holder bear AspectList: Connect with holder bear Jul 20, 2017

tests/bears/BearTest.py Outdated
@@ -111,6 +112,10 @@ def run(self, y: int, w: float):
yield w


class languagesTestBear(Bear, languages=['Python', 'C#']):

This comment has been minimized.

@sils

sils Jul 20, 2017

Member

why lower case?

This comment has been minimized.

@adhikasp

adhikasp Jul 20, 2017

Author Member

I believe it's a mistake (and I miss it)

@adhikasp adhikasp force-pushed the adhikasp:issue-4094 branch Jul 20, 2017

@adhikasp

This comment has been minimized.

Copy link
Member Author

adhikasp commented Jul 20, 2017

@userzimmermann
Copy link
Member

userzimmermann left a comment

@adhikasp Perfect! Let's quickly merge and go on to the next :)

@jayvdb

@userzimmermann

This comment has been minimized.

Copy link
Member

userzimmermann commented Jul 20, 2017

@userzimmermann

This comment has been minimized.

Copy link
Member

userzimmermann commented Jul 20, 2017

@rultor merge

@rultor

This comment has been minimized.

Copy link
Contributor

rultor commented Jul 20, 2017

@rultor merge

@userzimmermann OK, I'll try to merge now. You can check the progress of the merge here

@rultor

This comment has been minimized.

Copy link
Contributor

rultor commented Jul 20, 2017

@rultor merge

@adhikasp @userzimmermann Oops, I failed. You can see the full log here (spent 2min)

 * [new branch]      sils/newc  -> fork/sils/newc
 * [new branch]      sils/nextgen2 -> fork/sils/nextgen2
 * [new branch]      sils/perf  -> fork/sils/perf
 * [new branch]      sils/pr    -> fork/sils/pr
 * [new branch]      sils/proto -> fork/sils/proto
 * [new branch]      sils/quotes -> fork/sils/quotes
 * [new branch]      sils/resf  -> fork/sils/resf
 * [new branch]      sils/resoverlap -> fork/sils/resoverlap
 * [new branch]      sils/resultfilter -> fork/sils/resultfilter
 * [new branch]      sils/sem   -> fork/sils/sem
 * [new branch]      sils/setup -> fork/sils/setup
 * [new branch]      sils/simply -> fork/sils/simply
 * [new branch]      sils/swtest -> fork/sils/swtest
 * [new branch]      sils/trimlin -> fork/sils/trimlin
 * [new branch]      sils/trumpscript -> fork/sils/trumpscript
 * [new branch]      sils/tut   -> fork/sils/tut
 * [new branch]      sils/typeer -> fork/sils/typeer
 * [new branch]      sils/win   -> fork/sils/win
 * [new branch]      sils/wip/cachingprop -> fork/sils/wip/cachingprop
 * [new branch]      sils/wippatch -> fork/sils/wippatch
 * [new branch]      sils/xml   -> fork/sils/xml
 * [new branch]      sims/newcomerguide -> fork/sims/newcomerguide
 * [new branch]      tmp        -> fork/tmp
 * [new branch]      tulphoon/uselog -> fork/tulphoon/uselog
 * [new branch]      ud/spa-ci  -> fork/ud/spa-ci
 * [new branch]      udayan/fileproxy -> fork/udayan/fileproxy
 * [new branch]      udayan/newbears -> fork/udayan/newbears
 * [new branch]      underyx/req-version-specs -> fork/underyx/req-version-specs
 * [new branch]      wip/sils/profiling -> fork/wip/sils/profiling
 * [new branch]      wip/udayan/filesim -> fork/wip/udayan/filesim
 * [new branch]      wip/udayan/gui2 -> fork/wip/udayan/gui2
 * [new branch]      wip/udayan/guiproto -> fork/wip/udayan/guiproto
 * [new branch]      zimmermann/collecting -> fork/zimmermann/collecting
 * [new branch]      zimmermann/config -> fork/zimmermann/config
 * [new branch]      zimmermann/debug -> fork/zimmermann/debug
 * [new branch]      zimmermann/languages -> fork/zimmermann/languages
 * [new branch]      zimmermann/linter -> fork/zimmermann/linter
+ args=
+ '[' only == default ']'
+ '[' only == no ']'
+ '[' only == only ']'
+ args=' --ff-only'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/issue-4094
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch issue-4094 from fork.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch master set up to track remote branch master from origin.
Your branch is up-to-date with 'origin/master'.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff-only __rultor
fatal: Not possible to fast-forward, aborting.
'cid' file is absent, container wasn't started correctly

@adhikasp adhikasp force-pushed the adhikasp:issue-4094 branch Jul 21, 2017

@jayvdb

This comment has been minimized.

Copy link
Member

jayvdb commented Jul 21, 2017

unack 9557ab7

@jayvdb

This comment has been minimized.

Copy link
Member

jayvdb commented Jul 21, 2017

unack'd due to #4094 (comment)

tests/bears/BearTest.py Outdated
@@ -183,6 +194,10 @@ def test_detect_and_fix_aspects(self):
assert (CommitMessage.Shortlog.TrailingPeriod in
aspectsTestBear.aspects['fix'])

def test_aspectlist_bear(self):
assert aspectsTestBear.aspects['fix'].bear is aspectsTestBear

This comment has been minimized.

@jayvdb

jayvdb Jul 21, 2017

Member

use assertIs

tests/bears/BearTest.py Outdated
@@ -144,6 +149,12 @@ def tearDown(self):

class BearTest(BearTestBase):

def test_languages(self):
assert type(LanguagesTestBear.languages) is Languages

This comment has been minimized.

@jayvdb

jayvdb Jul 21, 2017

Member

use assertIn

@adhikasp adhikasp force-pushed the adhikasp:issue-4094 branch Jul 23, 2017

@jayvdb

jayvdb approved these changes Jul 24, 2017

pratyushprakash added some commits May 3, 2017

meta: Add Languages to bears
Add a languages argument to the meta bearclass to
signify the languges the bear handles.

Closes #4147
AspectList: Connect with holder bear
Connect AspectList with the holder bear to match aspects using
`__contains__` only if language of the aspect being checked matches
with a language that the bear handles.

Closes #4094

@adhikasp adhikasp force-pushed the adhikasp:issue-4094 branch to d036e92 Jul 24, 2017

@jayvdb

This comment has been minimized.

Copy link
Member

jayvdb commented Jul 24, 2017

@jayvdb

This comment has been minimized.

Copy link
Member

jayvdb commented Jul 24, 2017

@rultor merge

@rultor

This comment has been minimized.

Copy link
Contributor

rultor commented Jul 24, 2017

@rultor merge

@jayvdb OK, I'll try to merge now. You can check the progress of the merge here

@rultor rultor merged commit d036e92 into coala:master Jul 24, 2017

6 of 9 checks passed

ci/circleci CircleCI is running your tests
Details
continuous-integration/appveyor/branch Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
codecov/project 100% (target 100%)
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
review/gitmate/commit This commit has no issues. :)
Details
review/gitmate/manual This commit was acknowledged.
Details
review/gitmate/pr This PR has no issues. :)
Details
@rultor

This comment has been minimized.

Copy link
Contributor

rultor commented Jul 24, 2017

@rultor merge

@jayvdb Done! FYI, the full log is here (took me 2min)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.