Skip to content

Commit

Permalink
πŸ“¦ πŸ›’ 🐈 Merge branch 'master' into prominent-productname
Browse files Browse the repository at this point in the history
* master: (64 commits)
  🐈 upgrade deps
  Delist products/versions/plans.
  Unlisted versions can't be most recent version
  πŸ›’ merge migrations
  πŸ›’ Add missing migration.
  πŸ“¦ Upgrade github.py
  Update boto3 from 1.9.57 to 1.9.62
  Update cumulusci from 2.2.2 to 2.2.3
  Update service_identity from 17.0.0 to 18.1.0
  Update channels from 2.1.5 to 2.1.6
  Update newrelic from 4.6.0.106 to 4.8.0.110
  πŸ›’ Add is_listed boolean to Product/Plan/Version
  Order Products by Category, then order_key
  Do not run flow on CI until this is fixed: flow/flow-bin#138
  Run one-off flow check instead of starting server/watcher.
  Upload flow logs to CI
  Try running flow separately?
  Separate Flow from ESLint.
  better?
  🐈 Upgrade deps.
  ...
  • Loading branch information
jgerigmeyer committed Dec 13, 2018
2 parents 3d431af + 18ca6b2 commit 2bd0fb5
Show file tree
Hide file tree
Showing 144 changed files with 5,151 additions and 3,718 deletions.
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ jobs:
command: |
. venv/bin/activate
yarn lint
# @@@ We'd like to run `flow` here, but:
# https://github.com/flowtype/flow-bin/issues/138
# - store_artifacts:
# path: /tmp/flow
# destination: flow-logs

test-client:
working_directory: ~/metadeploy
Expand Down
9 changes: 2 additions & 7 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ settings:
- static
- node_modules
react:
version: '15.6.2'
flowVersion: '0.79.1'
version: '16.6.3'
flowVersion: '0.88.0'
plugins:
- react
- prettier
- flowtype-errors
- flowtype
extends:
- eslint:recommended
Expand All @@ -38,10 +37,6 @@ extends:
- prettier/flowtype
- prettier/react
rules:
# Flow
flowtype-errors/show-errors: 2
flowtype-errors/show-warnings: 1

# Prettier
prettier/prettier:
- 2
Expand Down
1 change: 1 addition & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ exclude =
node,
node_modules,
requirements
max-line-length=88
6 changes: 6 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[settings]
atomic=True
include_trailing_comma=True
line_length=88
multi_line_output=3
use_parentheses=True
1 change: 1 addition & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ Development Tasks
files
- ``yarn prettier``: formats ``.scss`` and ``.js`` files
- ``yarn eslint``: lints ``.js`` files
- ``yarn flow``: runs JS type-checking
- ``yarn stylelint``: lints ``.scss`` files
- ``yarn flake8``: lints ``.py`` files
- ``yarn build``: builds development (unminified) static assets into ``dist/``
Expand Down
Loading

0 comments on commit 2bd0fb5

Please sign in to comment.