Skip to content

Commit

Permalink
Merge 1cd2924 into 9b730f0
Browse files Browse the repository at this point in the history
  • Loading branch information
Djailla committed Jul 17, 2020
2 parents 9b730f0 + 1cd2924 commit a922c9a
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 14 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Expand Up @@ -5,11 +5,10 @@ python:
- 3.6
- 3.7
- 3.8
- pypy3

script: make travis
install:
- pip install .
- pip install -r requirements.txt
script: make travis
after_success:
- coveralls
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -30,6 +30,5 @@
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
],
)
3 changes: 1 addition & 2 deletions tests/fake_module.py
@@ -1,5 +1,4 @@
from datetime import datetime
from datetime import date
from datetime import date, datetime
from time import time, localtime, gmtime, strftime


Expand Down
7 changes: 1 addition & 6 deletions tests/test_asyncio.py
@@ -1,15 +1,10 @@
import asyncio
import datetime
from textwrap import dedent
from unittest import SkipTest


from freezegun import freeze_time

try:
import asyncio
except ImportError:
asyncio = False


def test_time_freeze_coroutine():
if not asyncio:
Expand Down
1 change: 0 additions & 1 deletion tests/test_datetimes.py
Expand Up @@ -15,7 +15,6 @@

try:
import maya

except ImportError:
maya = None

Expand Down
1 change: 0 additions & 1 deletion tests/test_uuid.py
@@ -1,4 +1,3 @@
from __future__ import print_function, absolute_import, unicode_literals
import datetime
import uuid

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py35, py36, py37, py38, pypy3
envlist = py35, py36, py37, py38

[testenv]
commands = make test NOSE_ARGS="{posargs}"
Expand Down

0 comments on commit a922c9a

Please sign in to comment.