Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add codecov support and enforce coverage tests #284

Merged
merged 1 commit into from
Dec 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[run]
include =
arrow/*.py
branch = True
source = arrow
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
sudo: false
language: python
python:
- 2.6
Expand All @@ -11,4 +12,6 @@ install:
- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then make build33; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then make build34; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then make build35; fi
- pip install codecov
script: make test
after_success: codecov
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build35:

test:
rm -f .coverage
. local/bin/activate && nosetests --all-modules --with-coverage arrow tests
. local/bin/activate && nosetests

docs:
touch docs/index.rst
Expand Down
10 changes: 7 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
Arrow - Better dates & times for Python
=======================================

.. image:: https://travis-ci.org/crsmithdev/arrow.png
.. image:: https://travis-ci.org/crsmithdev/arrow.svg
:alt: build status
:target: https://travis-ci.org/crsmithdev/arrow

.. image:: https://pypip.in/d/arrow/badge.png
.. image:: https://codecov.io/github/crsmithdev/arrow/coverage.svg?branch=master
:target: https://codecov.io/github/crsmithdev/arrow
:alt: Codecov

.. image:: https://img.shields.io/pypi/v/arrow.svg
:target: https://pypi.python.org/pypi/arrow
:alt: downloads
:target: https://crate.io/packages/arrow

Documentation: `arrow.readthedocs.org <http://arrow.readthedocs.org/en/latest/>`_
---------------------------------------------------------------------------------
Expand Down
58 changes: 15 additions & 43 deletions arrow/locales.py
Original file line number Diff line number Diff line change
Expand Up @@ -760,9 +760,7 @@ class UkrainianLocale(SlavicBaseLocale):
day_abbreviations = ['', 'пн', 'вт', 'ср', 'чт', 'пт', 'сб', 'нд']


class GermanLocale(Locale):

names = ['de', 'de_de']
class _DeutschLocaleCommonMixin(object):

past = 'vor {0}'
future = 'in {0}'
Expand All @@ -786,65 +784,39 @@ class GermanLocale(Locale):
'', 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli',
'August', 'September', 'Oktober', 'November', 'Dezember'
]

month_abbreviations = [
'', 'Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep',
'Okt', 'Nov', 'Dez'
]

day_names = [
'', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag',
'Samstag', 'Sonntag'
'', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag',
'Samstag', 'Sonntag'
]

day_abbreviations = ['', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So']
day_abbreviations = [
'', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So'
]

def _ordinal_number(self, n):
return '{0}.'.format(n)


class AustriaLocale(Locale):

names = ['de', 'de_at']

past = 'vor {0}'
future = 'in {0}'
class GermanLocale(_DeutschLocaleCommonMixin, Locale):

timeframes = {
'now': 'gerade eben',
'seconds': 'Sekunden',
'minute': 'einer Minute',
'minutes': '{0} Minuten',
'hour': 'einer Stunde',
'hours': '{0} Stunden',
'day': 'einem Tag',
'days': '{0} Tage',
'month': 'einem Monat',
'months': '{0} Monaten',
'year': 'einem Jahr',
'years': '{0} Jahren',
}
names = ['de', 'de_de']

month_names = [
'', 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli',
'August', 'September', 'Oktober', 'November', 'Dezember'
]
timeframes = _DeutschLocaleCommonMixin.timeframes.copy()
timeframes['days'] = '{0} Tagen'

month_abbreviations = [
'', 'Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep',
'Okt', 'Nov', 'Dez'
]

day_names = [
'', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag',
'Samstag', 'Sonntag'
]
class AustriaLocale(_DeutschLocaleCommonMixin, Locale):

day_abbreviations = [
'', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So'
]
names = ['de', 'de_at']

def _ordinal_number(self, n):
return '{0}.'.format(n)
timeframes = _DeutschLocaleCommonMixin.timeframes.copy()
timeframes['days'] = '{0} Tage'


class NorwegianLocale(Locale):
Expand Down
11 changes: 11 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[nosetests]
where = tests
verbosity = 2

all-modules = true
with-coverage = true
cover-min-percentage = 100
cover-package = arrow
cover-erase = true
cover-inclusive = true
cover-branches = true
5 changes: 2 additions & 3 deletions tests/arrow_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,10 @@ def test_to(self):
dt_from = datetime.now()
arrow_from = arrow.Arrow.fromdatetime(dt_from, tz.gettz('US/Pacific'))

result = arrow_from.to('UTC')

expected = dt_from.replace(tzinfo=tz.gettz('US/Pacific')).astimezone(tz.tzutc())

assertEqual(result.datetime, expected)
assertEqual(arrow_from.to('UTC').datetime, expected)
assertEqual(arrow_from.to(tz.tzutc()).datetime, expected)


class ArrowPicklingTests(Chai):
Expand Down
6 changes: 6 additions & 0 deletions tests/factory_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ def test_one_arg_tzinfo(self):

assertDtEqual(self.factory.get(tz.gettz('US/Pacific')), expected)

def test_kwarg_tzinfo(self):

expected = datetime.utcnow().replace(tzinfo=tz.tzutc()).astimezone(tz.gettz('US/Pacific'))

assertDtEqual(self.factory.get(tzinfo=tz.gettz('US/Pacific')), expected)

def test_one_arg_iso_str(self):

dt = datetime.utcnow()
Expand Down
5 changes: 5 additions & 0 deletions tests/formatter_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,8 @@ def test_am_pm(self):
dt = datetime(2012, 1, 1, 13)
assertEqual(self.formatter._format_token(dt, 'a'), 'pm')
assertEqual(self.formatter._format_token(dt, 'A'), 'PM')

def test_nonsense(self):
dt = datetime(2012, 1, 1, 11)
assertEqual(self.formatter._format_token(dt, None), None)
assertEqual(self.formatter._format_token(dt, 'NONSENSE'), None)
97 changes: 96 additions & 1 deletion tests/locales_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ def test_ordinal_number(self):
assertEqual(self.locale.ordinal_number(123), '123rd')
assertEqual(self.locale.ordinal_number(124), '124th')

def test_meridian_invalid_token(self):
assertEqual(self.locale.meridian(7, None), None)
assertEqual(self.locale.meridian(7, 'B'), None)
assertEqual(self.locale.meridian(7, 'NONSENSE'), None)


class ItalianLocalesTests(Chai):

Expand Down Expand Up @@ -172,6 +177,7 @@ def test_format_timeframe(self):

assertEqual(self.locale._format_timeframe('hours', -2), '2 tímum')
assertEqual(self.locale._format_timeframe('hours', 2), '2 tíma')
assertEqual(self.locale._format_timeframe('now', 0), 'rétt í þessu')


class MalayalamLocaleTests(Chai):
Expand Down Expand Up @@ -242,13 +248,17 @@ def setUp(self):
def test_format_timeframe(self):

assertEqual(self.locale._format_timeframe('hours', 2), '2 hodiny')
assertEqual(self.locale._format_timeframe('hours', 5), '5 hodin')
assertEqual(self.locale._format_timeframe('hour', 0), '0 hodin')
assertEqual(self.locale._format_timeframe('hours', -2), '2 hodinami')
assertEqual(self.locale._format_timeframe('hours', -5), '5 hodinami')
assertEqual(self.locale._format_timeframe('now', 0), 'Teď')

def test_format_relative_now(self):

result = self.locale._format_relative('Teď', 'now', 0)

assertEqual(result, 'Teď')

def test_format_relative_future(self):

result = self.locale._format_relative('hodinu', 'hour', 1)
Expand Down Expand Up @@ -309,3 +319,88 @@ def test_format_relative_future(self):
# Not currently implemented
def test_ordinal_number(self):
assertEqual(self.locale.ordinal_number(1), '1')


class FinnishLocaleTests(Chai):

def setUp(self):
super(FinnishLocaleTests, self).setUp()

self.locale = locales.FinnishLocale()

def test_format_timeframe(self):
assertEqual(self.locale._format_timeframe('hours', 2),
('2 tuntia', '2 tunnin'))
assertEqual(self.locale._format_timeframe('hour', 0),
('tunti', 'tunnin'))

def test_format_relative_now(self):
result = self.locale._format_relative(['juuri nyt', 'juuri nyt'], 'now', 0)
assertEqual(result, 'juuri nyt')

def test_format_relative_past(self):
result = self.locale._format_relative(['tunti', 'tunnin'], 'hour', 1)
assertEqual(result, 'tunnin kuluttua')

def test_format_relative_future(self):
result = self.locale._format_relative(['tunti', 'tunnin'], 'hour', -1)
assertEqual(result, 'tunti sitten')

def test_ordinal_number(self):
assertEqual(self.locale.ordinal_number(1), '1.')


class GermanLocaleTests(Chai):

def setUp(self):
super(GermanLocaleTests, self).setUp()

self.locale = locales.GermanLocale()

def test_ordinal_number(self):
assertEqual(self.locale.ordinal_number(1), '1.')


class HungarianLocaleTests(Chai):

def setUp(self):
super(HungarianLocaleTests, self).setUp()

self.locale = locales.HungarianLocale()

def test_format_timeframe(self):
assertEqual(self.locale._format_timeframe('hours', 2), '2 óra')
assertEqual(self.locale._format_timeframe('hour', 0), 'egy órával')
assertEqual(self.locale._format_timeframe('hours', -2), '2 órával')
assertEqual(self.locale._format_timeframe('now', 0), 'éppen most')


class ThaiLocaleTests(Chai):

def setUp(self):
super(ThaiLocaleTests, self).setUp()

self.locale = locales.ThaiLocale()

def test_year_full(self):
assertEqual(self.locale.year_full(2015), '2558')

def test_year_abbreviation(self):
assertEqual(self.locale.year_abbreviation(2015), '58')

def test_format_relative_now(self):
result = self.locale._format_relative('ขณะนี้', 'now', 0)
assertEqual(result, 'ขณะนี้')

def test_format_relative_past(self):
result = self.locale._format_relative('1 ชั่วโมง', 'hour', 1)
assertEqual(result, 'ในอีก 1 ชั่วโมง')
result = self.locale._format_relative('{0} ชั่วโมง', 'hours', 2)
assertEqual(result, 'ในอีก {0} ชั่วโมง')
result = self.locale._format_relative('ไม่กี่วินาที', 'seconds', 42)
assertEqual(result, 'ในอีกไม่กี่วินาที')

def test_format_relative_future(self):
result = self.locale._format_relative('1 ชั่วโมง', 'hour', -1)
assertEqual(result, '1 ชั่วโมง ที่ผ่านมา')

13 changes: 13 additions & 0 deletions tests/parser_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,19 @@ def test_parse_multiformat_all_fail(self):
with assertRaises(Exception):
self.parser._parse_multiformat('str', ['fmt_a', 'fmt_b'])

def test_parse_token_nonsense(self):
parts = {}
self.parser._parse_token('NONSENSE', '1900', parts)
assertEqual(parts, {})

def test_parse_token_invalid_meridians(self):
parts = {}
self.parser._parse_token('A', 'a..m', parts)
assertEqual(parts, {})
self.parser._parse_token('a', 'p..m', parts)
assertEqual(parts, {})



class DateTimeParserParseTests(Chai):

Expand Down