diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..a09c56df5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.idea diff --git a/.travis.yml b/.travis.yml index 22b7773d5..f457d1156 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,12 @@ jobs: - stage: code quality name: "pylint & mypy" install: - - pip install astroid pylint mypy==0.701 - make install script: make lint - stage: test name: "LBRY Unit Tests" install: - - pip install coverage - make install script: - cd lbry && HOME=/tmp coverage run -p --source=lbry -m unittest discover -vv tests.unit @@ -48,7 +46,6 @@ jobs: - name: "Run Examples" install: - - pip install coverage - make install script: - cd lbry && HOME=/tmp coverage run -p --source=lbry scripts/generate_json_api.py diff --git a/Makefile b/Makefile index fa76acf79..46220e6f7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ install: cd torba && pip install -e . cd lbry && pip install -e . + pip install mypy==0.701 + pip install coverage astroid pylint lint: cd lbry && pylint lbry @@ -9,4 +11,4 @@ lint: idea: mkdir -p .idea - cp -r lbry/scripts/idea/* .idea/ + cp -r lbry/scripts/idea/* .idea diff --git a/lbry/scripts/idea/.gitignore b/lbry/scripts/idea/.gitignore deleted file mode 100644 index 05695f2d8..000000000 --- a/lbry/scripts/idea/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# ignore everything -* -# except the .gitignore file -!.gitignore