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

Update dennis to 0.9 #2077

Merged
merged 1 commit into from Dec 18, 2017
Merged

Update dennis to 0.9 #2077

merged 1 commit into from Dec 18, 2017

Conversation

Trojan295
Copy link
Contributor

@Trojan295 Trojan295 commented Oct 21, 2017

Dennis library was updated to 0.9 and it contains the fix for mozilla/dennis#91.

This PR reverts #1282 and updates dennis to 0.9 to solve #1284

Copy link
Member

@nvzard nvzard left a comment

Choose a reason for hiding this comment

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

Please read the commit guidelines and modify your commit according to that.

https://api.coala.io/en/latest/Developers/Writing_Good_Commits.html

cmakelint~=1.3
cppclean~=0.12.0
cpplint~=1.3
dennis~=0.8
dennis~=0.9
Copy link
Member

Choose a reason for hiding this comment

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

As per the issue you have to update only to version= 0.9. I think have to make it to dennis==0.9 instead dennis~=0.9

Copy link
Member

Choose a reason for hiding this comment

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

unack 996b0b2

Copy link
Member

Choose a reason for hiding this comment

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

No, we avoid == if possible.

Copy link
Member

Choose a reason for hiding this comment

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

ack 996b0b2

@jayvdb
Copy link
Member

jayvdb commented Nov 16, 2017

ack 996b0b2

@RaiVaibhav
Copy link
Member

Problem in coverage on appveyor it's not 100% 😕

@jayvdb
Copy link
Member

jayvdb commented Nov 16, 2017

@gitmate-bot rebase

@gitmate-bot
Copy link
Collaborator

Hey! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost!

@gitmate-bot
Copy link
Collaborator

Automated rebase was successful!

@jayvdb
Copy link
Member

jayvdb commented Nov 16, 2017

Problem in coverage on appveyor it's not 100% 😕

ftr, there was no problem here.

@jayvdb
Copy link
Member

jayvdb commented Nov 16, 2017

@rultor merge

@rultor
Copy link

rultor commented Nov 16, 2017

@rultor merge

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

@rultor
Copy link

rultor commented Nov 16, 2017

@rultor merge

@Trojan295 @jayvdb Oops, I failed. You can see the full log here (spent 20s)

+ ff=only
+ rebase=false
+ container=coala_coala-bears_2077
+ as_root=true
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone git@github.com:coala/coala-bears.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'export '\''fork=git@github.com:Trojan295/coala-bears.git'\''' ']'
+ cd ..
+ cat
+ '[' true = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''fork=git@github.com:Trojan295/coala-bears.git'\''' ';' 'export '\''fork_branch=issue-1284'\''' ';' 'export '\''head=git@github.com:coala/coala-bears.git'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_id=2077'\''' ';' 'export '\''pull_title=Update dennis to 0.9'\''' ';' 'export '\''author=jayvdb'\''' ';' 'DATE=`date --utc +%Y%m%d%H%M%S`' ';' 'python3 .ci/adjust_version_number.py bears/VERSION -b "$DATE"' ';' 'bash .ci/check_maintainership.sh' ';' 'bash .ci/deploy.pypi.sh' ';'
+ gpgconf --reload gpg-agent
+ gpg --keyserver hkp://pool.sks-keyservers.net --verbose --recv-keys 9AF0FA4C
gpg: requesting key 9AF0FA4C from hkp server pool.sks-keyservers.net
gpg: armor header: Version: SKS 1.1.6
gpg: armor header: Comment: Hostname: keys.klaus-uwe.me
gpg: pub  2048R/9AF0FA4C 2014-08-17  Rultor.com <gpg@rultor.com>
gpg: key 9AF0FA4C: "Rultor.com <gpg@rultor.com>" not changed
gpg: Total number processed: 1
gpg:              unchanged: 1
+ gpg --version
gpg (GnuPG) 1.4.20
Copyright (C) 2015 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Home: ~/.gnupg
Supported algorithms:
Pubkey: RSA, RSA-E, RSA-S, ELG-E, DSA
Cipher: IDEA, 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH,
        CAMELLIA128, CAMELLIA192, CAMELLIA256
Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
Compression: Uncompressed, ZIP, ZLIB, BZIP2
++ pwd
++ pwd
+ gpg --verbose --keyring=/tmp/rultor-mTMF/.gpg/pubring.gpg --secret-keyring=/tmp/rultor-mTMF/.gpg/secring.gpg --decrypt repo/.ci/rultor_secrets.sh.asc
gpg: public key is 9A839C3A
gpg: using subkey 9A839C3A instead of primary key 9AF0FA4C
gpg: using subkey 9A839C3A instead of primary key 9AF0FA4C
gpg: encrypted with 2048-bit RSA key, ID 9A839C3A, created 2014-08-17
      "Rultor.com <gpg@rultor.com>"
gpg: AES256 encrypted data
gpg: original file name='rultor-OCHk'
+ gpg --no-tty --batch --verbose --decrypt --passphrase rultor-key:coala/coala-bears rultor_secrets.sh.enc
gpg: AES encrypted data
gpg: gpg-agent is not available in this session
gpg: encrypted with 1 passphrase
gpg: decryption failed: bad key
'cid' file is absent, container wasn't started correctly

@rultor
Copy link

rultor commented Nov 17, 2017

@rultor merge

@Makman2 @Trojan295 Oops, I failed. You can see the full log here (spent 22s)

+ ff=only
+ rebase=false
+ container=coala_coala-bears_2077
+ as_root=true
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone git@github.com:coala/coala-bears.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'export '\''fork=git@github.com:Trojan295/coala-bears.git'\''' ']'
+ cd ..
+ cat
+ '[' true = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''fork=git@github.com:Trojan295/coala-bears.git'\''' ';' 'export '\''fork_branch=issue-1284'\''' ';' 'export '\''head=git@github.com:coala/coala-bears.git'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_id=2077'\''' ';' 'export '\''pull_title=Update dennis to 0.9'\''' ';' 'export '\''author=makman2'\''' ';' 'DATE=`date --utc +%Y%m%d%H%M%S`' ';' 'python3 .ci/adjust_version_number.py bears/VERSION -b "$DATE"' ';' 'bash .ci/check_maintainership.sh' ';' 'bash .ci/deploy.pypi.sh' ';'
+ gpgconf --reload gpg-agent
+ gpg --keyserver hkp://pool.sks-keyservers.net --verbose --recv-keys 9AF0FA4C
gpg: requesting key 9AF0FA4C from hkp server pool.sks-keyservers.net
gpg: armor header: Version: SKS 1.1.6
gpg: armor header: Comment: Hostname: keys2.flanga.io
gpg: pub  2048R/9AF0FA4C 2014-08-17  Rultor.com <gpg@rultor.com>
gpg: key 9AF0FA4C: "Rultor.com <gpg@rultor.com>" not changed
gpg: Total number processed: 1
gpg:              unchanged: 1
+ gpg --version
gpg (GnuPG) 1.4.20
Copyright (C) 2015 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Home: ~/.gnupg
Supported algorithms:
Pubkey: RSA, RSA-E, RSA-S, ELG-E, DSA
Cipher: IDEA, 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH,
        CAMELLIA128, CAMELLIA192, CAMELLIA256
Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
Compression: Uncompressed, ZIP, ZLIB, BZIP2
++ pwd
++ pwd
+ gpg --verbose --keyring=/tmp/rultor-Ns7X/.gpg/pubring.gpg --secret-keyring=/tmp/rultor-Ns7X/.gpg/secring.gpg --decrypt repo/.ci/rultor_secrets.sh.asc
gpg: public key is 9A839C3A
gpg: using subkey 9A839C3A instead of primary key 9AF0FA4C
gpg: using subkey 9A839C3A instead of primary key 9AF0FA4C
gpg: encrypted with 2048-bit RSA key, ID 9A839C3A, created 2014-08-17
      "Rultor.com <gpg@rultor.com>"
gpg: AES256 encrypted data
gpg: original file name='rultor-OCHk'
+ gpg --no-tty --batch --verbose --decrypt --passphrase rultor-key:coala/coala-bears rultor_secrets.sh.enc
gpg: AES encrypted data
gpg: gpg-agent is not available in this session
gpg: encrypted with 1 passphrase
gpg: decryption failed: bad key
'cid' file is absent, container wasn't started correctly

@Makman2
Copy link
Member

Makman2 commented Dec 17, 2017

@gitmate-bot rebase

@gitmate-bot
Copy link
Collaborator

Hey! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost!

@gitmate-bot
Copy link
Collaborator

Automated rebase was successful!

@Makman2
Copy link
Member

Makman2 commented Dec 17, 2017

temporary build problem, PR is still approved.

@RaiVaibhav
Copy link
Member

RaiVaibhav commented Dec 17, 2017

reack 30c55f8

@Makman2
Copy link
Member

Makman2 commented Dec 17, 2017

hmm that's bad... I wanted to make this PR appear in the approved-list... anyway, keeping the tab open so I won't forget

This updates dennis to 0.9 and reverts
#1282
It also removes click as an explicit dependency

Fixes #1284
@Makman2
Copy link
Member

Makman2 commented Dec 18, 2017

@gitmate-bot rebase

@gitmate-bot
Copy link
Collaborator

Hey! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost!

@gitmate-bot
Copy link
Collaborator

Automated rebase was successful!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

8 participants