Skip to content

Commit

Permalink
Add .editorconfig to moban sync & moban sync
Browse files Browse the repository at this point in the history
Closes coala#5875
  • Loading branch information
kiy4h authored and jayvdb committed Nov 7, 2018
1 parent 5581131 commit f534894
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 35 deletions.
18 changes: 9 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# top-most EditorConfig file
root = true

[**]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
max_line_length = 80
trim_trailing_whitespace = true

# Set default charset and indentation for python files
[{*.py,coalib/**/*.py,./coala,tests/**/*.py}]
indent_style = space
# Set default indentation for python files
[*.py]
indent_size = 4
trim_trailing_whitespace = true

# 2 space indentation for yml files and package.json
[{package.json,*.yml}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
# Override trailing whitespace for markdown files
[*.md]
trim_trailing_whitespace = false
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ venv.bak/
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/
# Node rules
# Logs
logs
Expand Down Expand Up @@ -189,6 +192,9 @@ typings/
# Serverless directories
.serverless

# FuseBox cache
.fusebox/


# VirtualEnv rules
# Virtualenv
Expand Down
1 change: 1 addition & 0 deletions .moban.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ configuration:
configuration_dir: ../coala-mobans/
targets:
- .gitignore: core-gitignore.jj2
- .editorconfig: .editorconfig.jj2
- setup.py: core-setup.py.jj2
- setup.cfg: core-setup.cfg.jj2
- requirements.txt: requirements.txt.jj2
Expand Down
63 changes: 38 additions & 25 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,40 @@
)
DEPENDENCY_LINKS = []

KEYWORDS = [
'code-analysis',
'lint',
]


# from http://pypi.python.org/pypi?%3Aaction=list_classifiers

CLASSIFIERS = [
'Development Status :: 4 - Beta',

'Environment :: Console',
'Environment :: MacOS X',
'Environment :: Win32 (MS Windows)',

'Intended Audience :: Science/Research',
'Intended Audience :: Developers',

'License :: OSI Approved :: GNU Affero General Public License '
'v3 or later (AGPLv3+)',
'Operating System :: OS Independent',

'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: 3.4'
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3 :: Only',

'Topic :: Scientific/Engineering :: Information Analysis',
'Topic :: Software Development :: Quality Assurance',
'Topic :: Text Processing :: Linguistic',

]

SETUP_COMMANDS = {}

assert_supported_version()
Expand Down Expand Up @@ -291,6 +325,8 @@ def _decrement(version):
return previous


# This is an unfortunately needed comment

def egg_name_to_requirement(name):
name = name.strip()
parts = name.split('-')
Expand Down Expand Up @@ -422,6 +458,7 @@ def read_requirements(filename):
'bearlib/languages/documentation/*.coalang']
},
license='AGPL-3.0',
keywords=KEYWORDS,
data_files=data_files,
long_description=long_description,
entry_points={
Expand All @@ -433,30 +470,6 @@ def read_requirements(filename):
'coala-delete-orig = coalib.coala_delete_orig:main',
],
},
# from http://pypi.python.org/pypi?%3Aaction=list_classifiers
classifiers=[
'Development Status :: 4 - Beta',

'Environment :: Console',
'Environment :: MacOS X',
'Environment :: Win32 (MS Windows)',

'Intended Audience :: Science/Research',
'Intended Audience :: Developers',

'License :: OSI Approved :: GNU Affero General Public License '
'v3 or later (AGPLv3+)',

'Operating System :: OS Independent',

'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3 :: Only',

'Topic :: Scientific/Engineering :: Information Analysis',
'Topic :: Software Development :: Quality Assurance',
'Topic :: Text Processing :: Linguistic'],
classifiers=CLASSIFIERS,
cmdclass=SETUP_COMMANDS,
)
7 changes: 6 additions & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Radon requires colorama<0.4, but many other tools listed here will
# install a later version, so when pip tries to install radon it will
# ignore the dependency version difference and only fail when the
# bear is loaded.
colorama<4
argcomplete~=1.8
# coverage 4.4.2 broke compatibility with coverage-config-reload-plugin
# and thus broke https://github.com/jayvdb/coverage_env_plugin .
Expand All @@ -7,7 +12,7 @@ coverage-env-plugin~=0.1
coverage-config-reload-plugin~=0.2
codecov~=2.0.5
freezegun~=0.3.9
moban~=0.2.4
moban~=0.3.1
pytest~=3.6.1
pytest-cov~=2.4
pytest-env~=0.6.0
Expand Down

0 comments on commit f534894

Please sign in to comment.