Skip to content

Commit

Permalink
coala-quickstart: Sync moban
Browse files Browse the repository at this point in the history
  • Loading branch information
kiy4h authored and jayvdb committed Nov 7, 2018
1 parent 5c26e67 commit dc705e6
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .ci/check_moban.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -ex

if [ ! -d ../coala-mobans ]; then
git clone https://gitlab.com/coala/mobans \
--branch=${MOBAN_BRANCH} ../coala-mobans
--branch=${MOBAN_BRANCH} ../coala-mobans || exit 0
fi

date
Expand Down
77 changes: 68 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ venv.bak/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# VirtualEnv rules
# Virtualenv
# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
Expand Down Expand Up @@ -390,17 +393,11 @@ tmtags
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings
xcuserdata/

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
## Build generated
build/
DerivedData/
*.moved-aside

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -409,6 +406,68 @@ DerivedData/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/


# Eclipse rules

Expand Down
63 changes: 38 additions & 25 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,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 = {}


Expand Down Expand Up @@ -223,6 +257,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 @@ -348,37 +384,14 @@ def read_requirements(filename):
dependency_links=DEPENDENCY_LINKS,
package_data={'coala_quickstart': ['VERSION']},
license='AGPL-3.0',
keywords=KEYWORDS,
data_files=data_files,
long_description=long_description,
entry_points={
'console_scripts': [
'coala-quickstart = coala_quickstart.coala_quickstart: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,11 +1,16 @@
# 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
# coverage 4.4.2 broke compatibility with coverage-config-reload-plugin
# and thus broke https://github.com/jayvdb/coverage_env_plugin .
# See https://github.com/jayvdb/coverage_config_reload_plugin/issues/1
coverage==4.4.1
coverage-env-plugin~=0.1
coverage-config-reload-plugin~=0.2
codecov~=2.0.5
moban~=0.2.4
moban~=0.3.1
packaging~=16.8
pytest~=3.6.1
pytest-cov~=2.4
Expand Down

0 comments on commit dc705e6

Please sign in to comment.