Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Clean up test requirements and discontinue version pinning to ease ma…
…intenance

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Sep 5, 2018
1 parent f2bd1e8 commit 338068d
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 15 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -38,6 +38,7 @@ env:
secure: GqUDW0j4Ay8pS9tS/g5JBYGtgBG0g0oD2g4X9JXgVchiFj3GIRL+dwiXpgx3LELy7nCWF3EzClFxxMdVqqxizQ/I8xqiA0XL/rf5z/y+9d9nmKOxV8SV73n0eCgsHWkbdSLJ6MKs6s0Trlz9jLu/P+Bhfu2ttqkOH8WttfEf3VE=
install:
- if [[ $NMODE == 'nikola' ]]; then pip install --upgrade-strategy eager -Ur requirements-tests.txt; if [[ "$?" != '0' ]]; then cat /home/travis/.pip/pip.log; false; fi; fi
- if [[ $NMODE == 'nikola' ]]; then pip install --upgrade-strategy eager -U codacy-coverage; if [[ "$?" != '0' ]]; then cat /home/travis/.pip/pip.log; false; fi; fi
- if [[ $NMODE == 'basereq' ]]; then pip install --upgrade-strategy eager -Ur requirements.txt; if [[ "$?" != '0' ]]; then cat /home/travis/.pip/pip.log; false; fi; fi
- if [[ $NMODE == 'nikola' || $NMODE == 'basereq' ]]; then pip install .; fi
- if [[ $NMODE == 'flake8' ]]; then pip install flake8 pydocstyle; fi
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -12,7 +12,7 @@ init:

install:
- "%PYTHON%/python.exe -m pip install --upgrade-strategy eager -U pip setuptools wheel"
- "%PYTHON%/python.exe -m pip install --upgrade-strategy eager -Ur requirements-extras.txt pytest coverage pytest-cov mock freezegun"
- "%PYTHON%/python.exe -m pip install --upgrade-strategy eager -Ur requirements-tests.txt"
- "%PYTHON%/python.exe -m pip install ."

test_script:
Expand Down
11 changes: 4 additions & 7 deletions requirements-tests.txt
@@ -1,8 +1,5 @@
-r requirements-extras.txt
mock==2.0.0
coverage==4.5.1
pytest==3.7.4
pytest-cov==2.6.0
freezegun==0.3.10
codacy-coverage==1.3.11
colorama>=0.3.4
coverage>=4.5.1
pytest>=3.7.4
pytest-cov>=2.5.1
freezegun>=0.3.10
3 changes: 1 addition & 2 deletions scripts/jinjify.py
Expand Up @@ -10,7 +10,6 @@
import shutil
import tempfile

import colorama
import jinja2

dumb_replacements = [
Expand Down Expand Up @@ -103,7 +102,7 @@ def jinjify(in_theme, out_theme):


def error(msg):
print(colorama.Fore.RED + "ERROR:" + msg + colorama.Fore.RESET)
print("\033[1;31mERROR: {0}\033[0m".format(msg))


def mako2jinja(input_file):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_command_import_wordpress.py
Expand Up @@ -3,7 +3,7 @@
import os

import unittest
import mock
from unittest import mock

import nikola
import nikola.plugins.command.import_wordpress
Expand Down
2 changes: 1 addition & 1 deletion tests/test_command_init.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

import unittest
import mock
from unittest import mock

import nikola
from nikola.plugins.command.init import SAMPLE_CONF
Expand Down
2 changes: 1 addition & 1 deletion tests/test_metadata_extractors.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Test metadata extractors."""

import mock
from unittest import mock
import os
import pytest
from .base import FakeSite
Expand Down
2 changes: 1 addition & 1 deletion tests/test_rss_feeds.py
Expand Up @@ -10,7 +10,7 @@

import dateutil.tz
from lxml import etree
import mock
from unittest import mock

from .base import initialize_localeborg
import nikola
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import unittest
import mock
from unittest import mock
import os
import lxml.html
from nikola import metadata_extractors
Expand Down

0 comments on commit 338068d

Please sign in to comment.