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

DistributionRequirement enhancements #1403

Merged
merged 6 commits into from
Feb 15, 2017
Merged

DistributionRequirement enhancements #1403

merged 6 commits into from
Feb 15, 2017

Conversation

jayvdb
Copy link
Member

@jayvdb jayvdb commented Feb 4, 2017

DO NOT MERGE.

~~This should be merged after #1386 ~~

(1386 is going to take a while, and we need these in to assist with understanding needed Requirements)

@gitmate-bot
Copy link
Collaborator

Thanks for your contribution!

Reviewing pull requests take really a lot of time and we're all volunteers. Please make sure you go through the following check list and complete them all before pinging someone for a review.

As you learn things over your Pull Request please help others on the chat and on PRs to get their stuff right as well!

@Adrianzatreanu
Copy link
Contributor

ack a1a54c7

@Adrianzatreanu
Copy link
Contributor

ack 8f6c2dd

@Adrianzatreanu
Copy link
Contributor

ack a1a0a0d

@@ -14,7 +16,8 @@ class RubySyntaxBear:
Checks the code with ``ruby -wc`` on each file separately.
"""
LANGUAGES = {'Ruby'}
REQUIREMENTS = {GemRequirement('ruby', '2.1.5')}
REQUIREMENTS = {GemRequirement('ruby', '2.1.5'),
Copy link
Contributor

Choose a reason for hiding this comment

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

hm, does it need the gem requirement ruby too then?

Copy link
Member Author

@jayvdb jayvdb Feb 4, 2017

Choose a reason for hiding this comment

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

You're asking me ... ? You added it :P da62953

But yes, I think this GemRequirement needs to be revisited, and I'd be happy to remove it as redundant, but maybe you had some reason why the 2.1.5 is there...? (did they really only add -wc to ruby in that version?

Copy link
Contributor

Choose a reason for hiding this comment

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

i mostly copy pasted what we had in the gemfiles :) it is probably at that point that i found it relevant, and now since youre adding the system ruby, im asking if we still need the gem ruby :-??

Copy link
Member Author

Choose a reason for hiding this comment

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

Ya, good call.

@Adrianzatreanu
Copy link
Contributor

ack 28fef97

@Adrianzatreanu Adrianzatreanu changed the title DistributionRequirement enhancements [Don't MERGE] DistributionRequirement enhancements Feb 4, 2017
@Adrianzatreanu
Copy link
Contributor

ack 8b76bb6

@jayvdb jayvdb force-pushed the req-tidy branch 2 times, most recently from 3e0d973 to cb0dc2c Compare February 6, 2017 08:28
@jayvdb jayvdb changed the title [Don't MERGE] DistributionRequirement enhancements DistributionRequirement enhancements Feb 6, 2017
@jayvdb
Copy link
Member Author

jayvdb commented Feb 6, 2017

reack 78b1a54 49aafca 2cbd0f1 adf5638 3af1b47

@jayvdb
Copy link
Member Author

jayvdb commented Feb 6, 2017

@Adrianzatreanu , cb0dc2c is revised and ready for review, then this can be merged.
(I sort of want this tidy up done before starting a redesign for #1359 (comment))

@jayvdb
Copy link
Member Author

jayvdb commented Feb 6, 2017

unack adf5638 3af1b47

@jayvdb
Copy link
Member Author

jayvdb commented Feb 6, 2017

There isnt a package called 'java' in Ubuntu. It is default-jre

@Adrianzatreanu
Copy link
Contributor

ack 0607d90

@Adrianzatreanu
Copy link
Contributor

ack 66b59c1

@Adrianzatreanu
Copy link
Contributor

ack 63dc358

@Adrianzatreanu
Copy link
Contributor

please rebase :D

@jayvdb
Copy link
Member Author

jayvdb commented Feb 15, 2017

@jayvdb
Copy link
Member Author

jayvdb commented Feb 15, 2017

@rultor merge

@rultor
Copy link

rultor commented Feb 15, 2017

@rultor merge

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

@jayvdb
Copy link
Member Author

jayvdb commented Feb 15, 2017

@rultor
Copy link

rultor commented Feb 15, 2017

@rultor merge

@jayvdb Oops, I failed. You can see the full log here (spent 1min)

copying build/lib/bears/scala/scalastyle_config.xml -> build/bdist.linux-x86_64/wheel/bears/scala
creating build/bdist.linux-x86_64/wheel/bears/scss
copying build/lib/bears/scss/SCSSLintBear.py -> build/bdist.linux-x86_64/wheel/bears/scss
copying build/lib/bears/scss/__init__.py -> build/bdist.linux-x86_64/wheel/bears/scss
creating build/bdist.linux-x86_64/wheel/bears/shell
copying build/lib/bears/shell/ShellCheckBear.py -> build/bdist.linux-x86_64/wheel/bears/shell
copying build/lib/bears/shell/__init__.py -> build/bdist.linux-x86_64/wheel/bears/shell
creating build/bdist.linux-x86_64/wheel/bears/sql
copying build/lib/bears/sql/SQLintBear.py -> build/bdist.linux-x86_64/wheel/bears/sql
copying build/lib/bears/sql/__init__.py -> build/bdist.linux-x86_64/wheel/bears/sql
creating build/bdist.linux-x86_64/wheel/bears/swift
copying build/lib/bears/swift/TailorBear.py -> build/bdist.linux-x86_64/wheel/bears/swift
copying build/lib/bears/swift/__init__.py -> build/bdist.linux-x86_64/wheel/bears/swift
creating build/bdist.linux-x86_64/wheel/bears/typescript
copying build/lib/bears/typescript/TSLintBear.py -> build/bdist.linux-x86_64/wheel/bears/typescript
copying build/lib/bears/typescript/__init__.py -> build/bdist.linux-x86_64/wheel/bears/typescript
creating build/bdist.linux-x86_64/wheel/bears/vcs
copying build/lib/bears/vcs/__init__.py -> build/bdist.linux-x86_64/wheel/bears/vcs
creating build/bdist.linux-x86_64/wheel/bears/vcs/git
copying build/lib/bears/vcs/git/GitCommitBear.py -> build/bdist.linux-x86_64/wheel/bears/vcs/git
copying build/lib/bears/vcs/git/__init__.py -> build/bdist.linux-x86_64/wheel/bears/vcs/git
creating build/bdist.linux-x86_64/wheel/bears/verilog
copying build/lib/bears/verilog/VerilogLintBear.py -> build/bdist.linux-x86_64/wheel/bears/verilog
copying build/lib/bears/verilog/__init__.py -> build/bdist.linux-x86_64/wheel/bears/verilog
creating build/bdist.linux-x86_64/wheel/bears/vhdl
copying build/lib/bears/vhdl/VHDLLintBear.py -> build/bdist.linux-x86_64/wheel/bears/vhdl
copying build/lib/bears/vhdl/__init__.py -> build/bdist.linux-x86_64/wheel/bears/vhdl
creating build/bdist.linux-x86_64/wheel/bears/vimscript
copying build/lib/bears/vimscript/VintBear.py -> build/bdist.linux-x86_64/wheel/bears/vimscript
copying build/lib/bears/vimscript/__init__.py -> build/bdist.linux-x86_64/wheel/bears/vimscript
creating build/bdist.linux-x86_64/wheel/bears/xml2
copying build/lib/bears/xml2/__init__.py -> build/bdist.linux-x86_64/wheel/bears/xml2
copying build/lib/bears/xml2/XMLBear.py -> build/bdist.linux-x86_64/wheel/bears/xml2
creating build/bdist.linux-x86_64/wheel/bears/yaml
copying build/lib/bears/yaml/RAMLLintBear.py -> build/bdist.linux-x86_64/wheel/bears/yaml
copying build/lib/bears/yaml/YAMLLintBear.py -> build/bdist.linux-x86_64/wheel/bears/yaml
copying build/lib/bears/yaml/__init__.py -> build/bdist.linux-x86_64/wheel/bears/yaml
copying build/lib/bears/VERSION -> build/bdist.linux-x86_64/wheel/bears
running install_egg_info
Copying coala_bears.egg-info to build/bdist.linux-x86_64/wheel/coala_bears-0.10.0.dev20170215022824-py3.4.egg-info
running install_scripts
creating build/bdist.linux-x86_64/wheel/coala_bears-0.10.0.dev20170215022824.dist-info/WHEEL
Uploading distributions to https://pypi.python.org/pypi
Uploading coala_bears-0.10.0.dev20170215022824-py34.py35.py36-none-any.whl
Uploading distributions to https://pypi.python.org/pypi
Uploading coala-bears-0.10.0.dev20170215022824.tar.gz
+ mv /home/r/repo .
+ '[' -n '' ']'
++ whoami
+ sudo chown -R rultor repo
+ cd repo
+ git push origin master
remote: error: GH006: Protected branch update failed for refs/heads/master.        
remote: error: 4 of 4 required status checks are pending.        
To [email protected]:coala/coala-bears.git
 ! [remote rejected] master -> master (protected branch hook declined)
error: failed to push some refs to '[email protected]:coala/coala-bears.git'
container 52692f29aed53f5e4068d9e9540628019e8efddf5a603c345e22fbf7f02a6221 is dead
Wed Feb 15 02:29:33 UTC 2017

The linter is part of libxml2-utils, and is not
included in the libxml2 package.
apt package libperl-critic-perl depends on perl,
so the latter does not need to also be stated as
a separate dependency.
PHPLintBear only depends on the php executable.
RubySyntaxBear only depends on the ruby executable.

Removes 'ruby' from Gemfile, added in 35c242b.
ScalaLintBear only requires java.
CheckstyleBear currently only requires java.
@jayvdb
Copy link
Member Author

jayvdb commented Feb 15, 2017

@rultor merge

@rultor
Copy link

rultor commented Feb 15, 2017

@rultor merge

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

@rultor rultor merged commit 2a931b7 into coala:master Feb 15, 2017
@rultor
Copy link

rultor commented Feb 15, 2017

@rultor merge

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

@jayvdb jayvdb deleted the req-tidy branch February 15, 2017 02:58
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.

4 participants