Skip to content

Commit

Permalink
Change to a more standard way of specifying the eslint version
Browse files Browse the repository at this point in the history
Tested-by: Travis
  • Loading branch information
vmiklos authored and Travis CI committed Jun 23, 2020
1 parent 97e7df2 commit b08bf3b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ python:
dist: xenial
before_script:
- nvm install
- npm install -g [email protected]
- npm install
script: make check
after_success:
- "curl -o /tmp/travis-automerge https://raw.githubusercontent.com/vmiklos/osm-gimmisn/master/tools/travis-automerge"
Expand Down
4 changes: 3 additions & 1 deletion INSTALL.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ python3 -m venv osm-gimmisn-env

This makes sure that you will have exactly the same version of the depdendencies as everyone else.

- Install Python dependencies:
- Install the dependencies (Python, node and eslint):

----
pip install -r requirements.txt
nvm install
npm install
----

- Build the generated code and data:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ check-mypy: $(patsubst %.py,%.mypy,$(PYTHON_OBJECTS))
$(QUIET_PYLINT)env PYTHONPATH=. pylint $< && touch $@

%.eslint : %.js Makefile .eslintrc
$(QUIET_ESLINT)eslint $< && touch $@
$(QUIET_ESLINT)node_modules/eslint/bin/eslint.js $< && touch $@

%.mypy: %.py Makefile
$(QUIET_MYPY)mypy --python-version 3.6 --strict --no-error-summary $< && touch $@
Expand Down
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"eslint": "7.0.0"
}
}

0 comments on commit b08bf3b

Please sign in to comment.