From 8f1f040fb55f918a738159af06836b82a0bc2398 Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Mon, 28 May 2018 16:29:28 -0600 Subject: Spring Cleaning --- Dockerfile | 45 ++++-------------------------- eslintrc.js | 14 ---------- eslintrc.json | 19 ------------- flake8 | 5 +--- sass-lint.yaml | 87 ---------------------------------------------------------- 5 files changed, 7 insertions(+), 163 deletions(-) delete mode 100644 eslintrc.js delete mode 100644 eslintrc.json delete mode 100644 sass-lint.yaml diff --git a/Dockerfile b/Dockerfile index 9284a23..366d215 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,9 @@ RUN apt-get update && apt-get install -y \ # For python crypto libraries libssl-dev \ libffi-dev \ - locales + locales \ + # For Youcompleteme + cmake # Generally a good idea to have these, extensions sometimes need them RUN locale-gen en_US.UTF-8 @@ -38,37 +40,12 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -# Install PHP 5.6/Neovim -RUN add-apt-repository ppa:ondrej/php +# Install Neovim RUN add-apt-repository ppa:neovim-ppa/stable - -# Install custom packages RUN apt-get update && apt-get install -y \ - php5.6 \ - php5.6-zip \ - php5.6-xml \ neovim -######################################## -# PHP -######################################## - -# Download composer and move it to new location -RUN curl -sS https://getcomposer.org/installer | php -RUN mv composer.phar /usr/local/bin/composer -# Update the path to include composer bins -ENV PATH "$PATH:/root/.composer/vendor/bin" -# Composer install Code Sniff -RUN composer global require "squizlabs/php_codesniffer=*" -# Install Symfony 2 coding standard -RUN composer global require --dev escapestudios/symfony2-coding-standard:~2.0 -# Add Symfony 2 coding standard to the phpcs paths -RUN phpcs --config-set installed_paths /root/.composer/vendor/escapestudios/symfony2-coding-standard -# Install custom linting -ADD PEARish.xml /root/PEARish.xml - - ######################################## # Python ######################################## @@ -81,16 +58,6 @@ RUN pip3 install pep8-naming pep257 isort mypy ansible-lint flake8-bugbear RUN pip3 install flake8-commas flake8-comprehensions -######################################## -# Dasht Documentation -######################################## -ADD dasht/bin/* /usr/local/bin/ -ENV DASHT_DOCSETS_DIR /root/.local/share/dasht/docsets -RUN mkdir -p /root/.local/share/dasht/docsets -RUN dasht-docsets-install --force django -RUN dasht-docsets-install --force python_3 - - ######################################## # Personalizations ######################################## @@ -107,9 +74,9 @@ RUN tic /tmp/$TERM.ti CMD ["/bin/bash"] # Add nvim config. Put this last since it changes often ADD nvim /root/.config/nvim -# Install neovim Modules +# Install neovim plugins RUN nvim -i NONE -c PlugInstall -c quitall > /dev/null 2>&1 -RUN nvim -i NONE -c UpdateRemotePlugins -c quitall > /dev/null 2>&1 +RUN cd /root/.config/nvim/plugged/YouCompleteMe && python3 install.py # Add flake8 config, don't trigger a long build process ADD flake8 /root/.flake8 # Add local vim-options, can override the one inside diff --git a/eslintrc.js b/eslintrc.js deleted file mode 100644 index 477d021..0000000 --- a/eslintrc.js +++ /dev/null @@ -1,14 +0,0 @@ -module.exports = { - 'root': true, - 'extends': 'airbnb-base', - 'globals': { - 'window': true, - 'document': true, - 'jQuery': false, - '$': true, - 'Foundation': true - }, - 'rules': { - 'max-len': ['error', 120] - } -} diff --git a/eslintrc.json b/eslintrc.json deleted file mode 100644 index 289e875..0000000 --- a/eslintrc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "airbnb", - "rules": { - "no-undef": 0, - "prefer-arrow-callback": 0, - "no-console": 0, - "require-jsdoc": ["error", { - "require": { - "FunctionDeclaration": true, - "MethodDefinition": false, - "ClassDeclaration": false - } - }], - "valid-jsdoc": ["error", { - "requireParamDescription": true, - "requireReturn": false - }] - } -} diff --git a/flake8 b/flake8 index c26b1a7..464614b 100644 --- a/flake8 +++ b/flake8 @@ -3,7 +3,4 @@ exclude = migrations, __init__.py, settings, -# I absolutely do not endorse 120 line length however many legacy projects have long lines -# so I use vim highlighting to higlight the 80 limit and have linting only complain -# about really long lengths -max-line-length = 119 +max-line-length = 99 diff --git a/sass-lint.yaml b/sass-lint.yaml deleted file mode 100644 index ebd9552..0000000 --- a/sass-lint.yaml +++ /dev/null @@ -1,87 +0,0 @@ -options: - formatter: stylish -files: - include: '**/*.s+(a|c)ss' -rules: - # Extends - extends-before-mixins: 1 - extends-before-declarations: 1 - placeholder-in-extend: 0 - - # Mixins - mixins-before-declarations: 1 - - # Line Spacing - one-declaration-per-line: 1 - empty-line-between-blocks: 1 - single-line-per-selector: 1 - - # Disallows - no-color-keywords: 1 - no-color-literals: 0 - no-css-comments: 1 - no-debug: 1 - no-duplicate-properties: 1 - no-empty-rulesets: 1 - no-extends: 0 - no-ids: 1 - no-important: 0 - no-invalid-hex: 1 - no-mergeable-selectors: 0 - no-misspelled-properties: 0 - no-qualifying-elements: 1 - no-trailing-zero: 1 - no-transition-all: 0 - no-url-protocols: 1 - no-vendor-prefixes: 0 - no-warn: 1 - property-units: 0 - - # Nesting - force-attribute-nesting: 1 - force-element-nesting: 1 - force-pseudo-nesting: 0 - - # Name Formats - class-name-format: 0 - - function-name-format: 1 - id-name-format: 0 - mixin-name-format: 1 - placeholder-name-format: 1 - variable-name-format: 0 - - # Style Guide - bem-depth: 0 - border-zero: 1 - brace-style: 1 - clean-import-paths: 0 - empty-args: 1 - hex-length: 1 - hex-notation: 1 - indentation: 0 - leading-zero: - - 1 - - - include: true - nesting-depth: 1 - property-sort-order: 0 - quotes: 1 - shorthand-values: 1 - url-quotes: 1 - variable-for-property: 1 - zero-unit: 1 - - # Inner Spacing - space-after-comma: 1 - space-before-colon: 0 - space-after-colon: 1 - space-before-brace: 1 - space-before-bang: 1 - space-after-bang: 1 - space-between-parens: 1 - space-around-operator: 1 - - # Final Items - trailing-semicolon: 1 - final-newline: 1 -- cgit v1.2.3