Skip to content

Commit

Permalink
Merge branch 'master' into move_logic_outside_world_map
Browse files Browse the repository at this point in the history
  • Loading branch information
mrniket committed Apr 23, 2018
2 parents ab4840b + 531b462 commit dd4b1cc
Show file tree
Hide file tree
Showing 43 changed files with 689 additions and 431 deletions.
26 changes: 26 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
engines:
csslint:
enabled: true
eslint:
enabled: true
fixme:
enabled: true
pep8:
enabled: true
checks:
E501:
enabled: false
radon:
enabled: true
scss-lint:
enabled: false
exclude_paths:
- "game/_version.py"
- "versioneer.py"
ratings:
paths:
- "**.css"
- "**.js"
- "**.py"
- "**.scss"
34 changes: 34 additions & 0 deletions .csslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"adjoining-classes": false,
"box-model": false,
"box-sizing": false,
"bulletproof-font-face": false,
"compatible-vendor-prefixes": false,
"display-property-grouping": false,
"duplicate-background-images": false,
"duplicate-properties": false,
"empty-rules": false,
"fallback-colors": false,
"floats": false,
"font-faces": false,
"font-sizes": false,
"gradients": false,
"ids": false,
"import": false,
"important": false,
"known-properties": false,
"non-link-hover": false,
"outline-none": false,
"overqualified-elements": false,
"qualified-headings": false,
"regex-selectors": false,
"shorthand": false,
"star-property-hack": false,
"text-indent": false,
"underscore-property-hack": false,
"vendor-prefix": false,
"unique-headings": false,
"universal-selector": false,
"unqualified-attributes": false,
"zero-units": false
}
262 changes: 262 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,262 @@
ecmaFeatures: {}
rules:
no-alert: 0
no-array-constructor: 0
no-bitwise: 0
no-caller: 0
no-catch-shadow: 0
no-class-assign: 0
no-cond-assign: 2
no-console: 2
no-const-assign: 0
no-constant-condition: 2
no-continue: 0
no-control-regex: 2
no-debugger: 2
no-delete-var: 2
no-div-regex: 0
no-dupe-keys: 2
no-dupe-args: 2
no-duplicate-case: 2
no-else-return: 0
no-empty: 2
no-empty-character-class: 2
no-empty-label: 0
no-eq-null: 0
no-eval: 0
no-ex-assign: 2
no-extend-native: 0
no-extra-bind: 0
no-extra-boolean-cast: 2
no-extra-parens: 0
no-extra-semi: 2
no-fallthrough: 2
no-floating-decimal: 0
no-func-assign: 2
no-implicit-coercion: 0
no-implied-eval: 0
no-inline-comments: 0
no-inner-declarations:
- 2
- functions
no-invalid-regexp: 2
no-invalid-this: 0
no-irregular-whitespace: 2
no-iterator: 0
no-label-var: 0
no-labels: 0
no-lone-blocks: 0
no-lonely-if: 0
no-loop-func: 0
no-mixed-requires:
- 0
- false
no-mixed-spaces-and-tabs:
- 2
- false
linebreak-style:
- 0
- unix
no-multi-spaces: 0
no-multi-str: 0
no-multiple-empty-lines:
- 0
- max: 2
no-native-reassign: 0
no-negated-in-lhs: 2
no-nested-ternary: 0
no-new: 0
no-new-func: 0
no-new-object: 0
no-new-require: 0
no-new-wrappers: 0
no-obj-calls: 2
no-octal: 2
no-octal-escape: 0
no-param-reassign: 0
no-path-concat: 0
no-plusplus: 0
no-process-env: 0
no-process-exit: 0
no-proto: 0
no-redeclare: 2
no-regex-spaces: 2
no-reserved-keys: 0
no-restricted-modules: 0
no-return-assign: 0
no-script-url: 0
no-self-compare: 0
no-sequences: 0
no-shadow: 0
no-shadow-restricted-names: 0
no-spaced-func: 0
no-sparse-arrays: 2
no-sync: 0
no-ternary: 0
no-trailing-spaces: 0
no-this-before-super: 0
no-throw-literal: 0
no-undef: 2
no-undef-init: 0
no-undefined: 0
no-unexpected-multiline: 0
no-underscore-dangle: 0
no-unneeded-ternary: 0
no-unreachable: 2
no-unused-expressions: 0
no-unused-vars:
- 2
- vars: all
args: after-used
no-use-before-define: 0
no-useless-call: 0
no-void: 0
no-var: 0
no-warning-comments:
- 0
- terms:
- todo
- fixme
- xxx
location: start
no-with: 0
array-bracket-spacing:
- 0
- never
arrow-parens: 0
arrow-spacing: 0
accessor-pairs: 0
block-scoped-var: 0
brace-style:
- 0
- 1tbs
callback-return: 0
camelcase: 0
comma-dangle:
- 2
- never
comma-spacing: 0
comma-style: 0
complexity:
- 2
- 11
computed-property-spacing:
- 0
- never
consistent-return: 0
consistent-this:
- 0
- that
constructor-super: 0
curly:
- 0
- all
default-case: 0
dot-location: 0
dot-notation:
- 0
- allowKeywords: true
eol-last: 0
eqeqeq: 0
func-names: 0
func-style:
- 0
- declaration
generator-star-spacing: 0
guard-for-in: 0
handle-callback-err: 0
indent: 0
init-declarations: 0
key-spacing:
- 0
- beforeColon: false
afterColon: true
lines-around-comment: 0
max-depth:
- 0
- 4
max-len:
- 0
- 80
- 4
max-nested-callbacks:
- 0
- 2
max-params:
- 0
- 3
max-statements:
- 0
- 10
new-cap: 0
new-parens: 0
newline-after-var: 0
object-curly-spacing:
- 0
- never
object-shorthand: 0
one-var: 0
operator-assignment:
- 0
- always
operator-linebreak: 0
padded-blocks: 0
prefer-const: 0
prefer-spread: 0
prefer-reflect: 0
quote-props: 0
quotes:
- 0
- double
radix: 0
require-yield: 0
semi: 0
semi-spacing:
- 0
- before: false
after: true
sort-vars: 0
space-after-keywords:
- 0
- always
space-before-blocks:
- 0
- always
space-before-function-paren:
- 0
- always
space-in-parens:
- 0
- never
space-infix-ops: 0
space-return-throw-case: 0
space-unary-ops:
- 0
- words: true
nonwords: false
spaced-comment: 0
strict: 0
use-isnan: 2
valid-jsdoc: 0
valid-typeof: 2
vars-on-top: 0
wrap-iife: 0
wrap-regex: 0
yoda:
- 0
- never
env:
browser: true
node: true
jquery: true
amd: true
commonjs: true
globals:
pluralidx: false
gettext: false
ngettext: false
gettext_noop: false
pgettext: false
npgettext: false
interpolate: false
get_format: false
68 changes: 41 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,44 @@ env:
- secure: "TNhj8oXrtBzCkkJDA8qbDmqUggK9Kbsy8Itgi0+VmXB+3bVRornZMS38ppaFz+BVOTdL80ZvN2s/OPV106QjFv0Hx1MmWAw4kNST2QBtxFXBHRKYtr7NtBN0jr11el1fG83YdpeZYQbc5aqbJ4OPz2GpfhGfDVhVGPjMFMKXI5XbTbbl+HCEL67ywozt964LhpuuXTaX7jgYFiJUtcwkYRUaDYY3ryJvMSOx95AjKyRMNC5JlgAqbJuYsOTm1eVZtfQ1jYVvd/NuAHOMDNpZWvcIaxTuc3k4XZh4UPryuRJWfjgjIq6kua7Q6ho6W2GbDgN2b/9lIldkTR8QfLSnCNLJIg6KJZ2gmIQg7u+nZHemdugo9XkvfmKXfB/t3HChFX1HNtS4gSeIn874IynLHx3UJ1lxm7BdDbF4Jjijffj5uWDGqVj3/Myd2jdFTJCoLJXvYI7la6ouMzXW5aDFhy2UXK2A3q7aBbaD64+U1R7YPGIyvfAd7NCF11vtRvJGI/fNjO5S1EuSacrQm7CiXu0rd0L5EOSU85XNTQsWN6xxJKEcc8Hx9YLRXkmR7gK9LoEPTUwFbfVXBUvnOsZav3MOBBxzj4+eLxkx2B1vbY2Lx5yPAqyWwi3vet46NEZUIKgqK+xRYQKj6dj3OF1gx7LOcyhpyevdpTZotiEx0C4=" # SNAP_API_AUTH
git:
depth: 9999999 # Building untagged builds needs enough depth to get the latest tag
before_script:
# Download kubectl, which is a requirement for using minikube.
- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
# Download minikube.
- curl -Lo minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
- sudo minikube start --vm-driver=none --kubernetes-version=v1.7.0
# Fix the kubectl context, as it's often stale.
- minikube update-context
# Wait for Kubernetes to be up and ready.
- JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
install:
- pip install .
- pip install coveralls
script:
- python all_tests.py --coverage
after_success:
- coveralls
deploy:
provider: pypi
user: ocadotechnology
password:
secure: "dX2M4PpyGwa1bjpJN/Wk3EORWRXuTS14ZQEQ7Ndqk/WnOZlNqD5t/WiITTdqBWoR/ScvQiGBzR/VdRLZllkGrhupoMrtkfCldaxEI3/wbbwW9CiLuwyR/V5xgVj9TA+PtXErjgAqG9KRtyaBEOaC20t13Uc6vuIc9e6aXkzhQ9hf3vVMlnABOZP3f/2R3+sJQMLylGPCz/6BAs2U+nyxGJCpfq0aJK7H2aVPUKtM1/nscuhvsrl8yU+RWYS3idgfXDuPlwqKvRL9xbEm1DC3ByCFwwzAGCPlUtzYlx6Ttrg8Jv6S1cgsjxijzV5QqU+k1JhmY3jDqqmMROFAaY3wJ6038xUbn4zlgvXgtCayiebJukSMR7tJoVrs6ao26QPsbLNZdReDzSXJR05pgB4I8gGTlIKeZE8zOS75hkv0CdMjmIsQhTeMKqQcATuN8QszYRP4uO7vG+3I7hNSK8HcqxHtNLEDq2/QKDAVBve0R5CeEvLMnSxj7UydO+HuJUgickjHuJUmLZ+7iR9i1p6G0MUpKq/n8izSponvShu0lDshrNWJ9PYuhRD4Yvnp4/FCSxdY0+u7pHJsbluGcIvaAlwoa5O01Seu2pVpox8hVTIhn9LuR0wP7Ed4Nxper7cMNgugqb8J9BybSlMjRlBYmI7FQePCdsu1ETNI9JDHAug="
distributions: "bdist_wheel sdist"
on:
repo: ocadotechnology/aimmo
after_deploy:
- "curl -d POST -v https://semaphoreci.com/api/v1/projects/${SEMAPHORE_PROJECT_ID}/master/build?auth_token=${SEMAPHORE_API_AUTH}"
stages:
- name: test
- name: deploy
if: branch = master
jobs:
include:
- stage: test
before_script:
# Download kubectl, which is a requirement for using minikube.
- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
# Download minikube.
- curl -Lo minikube https://storage.googleapis.com/minikube/releases/v0.25.2/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
- sudo minikube start --vm-driver=none --kubernetes-version=v1.7.0
# Fix the kubectl context, as it's often stale.
- minikube update-context
# Wait for Kubernetes to be up and ready.
- JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
install:
- pip install .
- pip install coveralls
script:
- python all_tests.py --coverage
after_success:
- coveralls
- # Frontend tests
install:
- cd game_frontend && yarn
script:
- yarn test
- stage: deploy
script: skip
deploy:
provider: pypi
user: ocadotechnology
password:
secure: "dX2M4PpyGwa1bjpJN/Wk3EORWRXuTS14ZQEQ7Ndqk/WnOZlNqD5t/WiITTdqBWoR/ScvQiGBzR/VdRLZllkGrhupoMrtkfCldaxEI3/wbbwW9CiLuwyR/V5xgVj9TA+PtXErjgAqG9KRtyaBEOaC20t13Uc6vuIc9e6aXkzhQ9hf3vVMlnABOZP3f/2R3+sJQMLylGPCz/6BAs2U+nyxGJCpfq0aJK7H2aVPUKtM1/nscuhvsrl8yU+RWYS3idgfXDuPlwqKvRL9xbEm1DC3ByCFwwzAGCPlUtzYlx6Ttrg8Jv6S1cgsjxijzV5QqU+k1JhmY3jDqqmMROFAaY3wJ6038xUbn4zlgvXgtCayiebJukSMR7tJoVrs6ao26QPsbLNZdReDzSXJR05pgB4I8gGTlIKeZE8zOS75hkv0CdMjmIsQhTeMKqQcATuN8QszYRP4uO7vG+3I7hNSK8HcqxHtNLEDq2/QKDAVBve0R5CeEvLMnSxj7UydO+HuJUgickjHuJUmLZ+7iR9i1p6G0MUpKq/n8izSponvShu0lDshrNWJ9PYuhRD4Yvnp4/FCSxdY0+u7pHJsbluGcIvaAlwoa5O01Seu2pVpox8hVTIhn9LuR0wP7Ed4Nxper7cMNgugqb8J9BybSlMjRlBYmI7FQePCdsu1ETNI9JDHAug="
distributions: "bdist_wheel sdist"
on:
repo: ocadotechnology/aimmo
after_deploy:
- "curl -d POST -v https://semaphoreci.com/api/v1/projects/${SEMAPHORE_PROJECT_ID}/master/build?auth_token=${SEMAPHORE_API_AUTH}"
Loading

0 comments on commit dd4b1cc

Please sign in to comment.