Skip to content
Permalink
Browse files

Fix tests (remove unused dependencies, move to v7/)

  • Loading branch information
Kwpolska committed Jan 8, 2017
1 parent e87add9 commit 4ab0897acac6c1e99bcfd715f8f49d6636b30c9a
Showing with 8 additions and 8 deletions.
  1. +6 −6 .travis.yml
  2. 0 {scripts → }/getpyver.py
  3. +1 −1 tests/test_command_tags.py
  4. +1 −1 tests/test_helloworld.py
@@ -7,23 +7,23 @@ addons:
apt:
packages:
- language-pack-en-base
- enchant
python:
- "3.3"
- "3.4"
- "3.5"
- "3.6"
matrix:
include:
- python: "3.5"
- python: "3.6"
env: NMODE=flake8
env:
NMODE=nikola
install:
- "if [[ $NMODE == 'nikola' ]]; then wget https://github.com/getnikola/wheelhouse/archive/$(scripts/getpyver.py).zip; fi"
- "if [[ $NMODE == 'nikola' ]]; then unzip $(scripts/getpyver.py).zip; fi"
- "if [[ $NMODE == 'nikola' ]]; then pip install --use-wheel --no-index --find-links=wheelhouse-$(scripts/getpyver.py short) lxml Pillow ipykernel notebook PyYAML; fi"
- "if [[ $NMODE == 'nikola' ]]; then wget https://github.com/getnikola/wheelhouse/archive/$(getpyver.py).zip; fi"
- "if [[ $NMODE == 'nikola' ]]; then unzip $(getpyver.py).zip; fi"
- "if [[ $NMODE == 'nikola' ]]; then pip install --use-wheel --no-index --find-links=wheelhouse-$(getpyver.py short) lxml Pillow ipykernel notebook PyYAML; fi"
- "if [[ $NMODE == 'nikola' ]]; then pip install git+https://github.com/getnikola/nikola.git#egg=Nikola; fi"
- "if [[ $NMODE == 'nikola' ]]; then find v7/*/ | grep -v import_tumblr | grep -v wiki | grep 'requirements.txt' | xargs cat | sort | uniq | xargs pip install && true; fi"
- "if [[ $NMODE == 'nikola' ]]; then find v7 -not -path v7/wiki/requirements.txt -not -path v7/slimish/requirements.txt -not -path v7/import_tumblr/requirements.txt -name requirements.txt | xargs cat | sort | uniq | xargs pip install && true; fi"
- "if [[ $NMODE == 'flake8' ]]; then pip install flake8; fi"
script:
- "if [[ $NMODE == 'nikola' ]]; then py.test tests/; fi"
File renamed without changes.
@@ -10,7 +10,7 @@

from nikola import nikola

PLUGIN_PATH = os.path.abspath(os.path.join('v6', 'tags'))
PLUGIN_PATH = os.path.abspath(os.path.join('v7', 'tags'))
sys.path.append(PLUGIN_PATH)

try:
@@ -5,7 +5,7 @@
import sys
import unittest

sys.path.append(os.path.join('v6', 'helloworld'))
sys.path.append(os.path.join('v7', 'helloworld'))

from helloworld import Plugin as HelloWorld
from nikola.utils import LOGGER

0 comments on commit 4ab0897

Please sign in to comment.
You can’t perform that action at this time.