Skip to content

Commit

Permalink
Merge pull request #29 from a-detiste/main
Browse files Browse the repository at this point in the history
remove Python2 crumbs
  • Loading branch information
cokelaer authored Apr 28, 2024
2 parents 8afabee + 3009868 commit e9aa8ef
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 9 deletions.
1 change: 0 additions & 1 deletion easydev/platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# Documentation: http://easydev-python.readthedocs.io
#
##############################################################################
from __future__ import absolute_import # avoids conflict with standard module

import os
import sys
Expand Down
1 change: 0 additions & 1 deletion easydev/progressbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#
##############################################################################
"""A progress bar copied and adapted from pyMC code (dec 2014)"""
from __future__ import print_function

import sys
import time
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ pytest-timeout = "^2.2.0"
pytest-runner = "^6.0.1"
coveralls = "^3.3.1"
flaky = "^3.7.0"
mock = "^5.1.0"


[tool.poetry.group.doc.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion test/test_appdirs.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mock
from unittest import mock


def test_app():
Expand Down
5 changes: 1 addition & 4 deletions test/test_browse.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
from easydev import browser

try:
from unittest.mock import patch
except:
from mock import patch
from unittest.mock import patch


def test_browse(mocker):
Expand Down
2 changes: 1 addition & 1 deletion test/test_misc.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os.path

# from mock import patch
# from unittest.mock import patch
import subprocess

from easydev.misc import cmd_exists, get_home, in_ipynb
Expand Down

0 comments on commit e9aa8ef

Please sign in to comment.