Skip to content

Commit bb0dea9

Browse files
committed
Remove nose dependency
1 parent d8be695 commit bb0dea9

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

setup.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import os
12
from os.path import abspath, dirname, join
2-
from os import environ
33
from setuptools import setup
44

55
__version__ = None
@@ -11,11 +11,12 @@
1111
"pytz",
1212
]
1313

14-
tests_require = ["nose"]
15-
16-
if "SAGAN_WITHOUT_SSL" not in environ:
14+
if "SAGAN_WITHOUT_SSL" not in os.environ:
1715
install_requires.append("cryptography")
1816

17+
# Allow setup.py to be run from any path
18+
os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
19+
1920
# Get proper long description for package
2021
current_dir = dirname(abspath(__file__))
2122
description = open(join(current_dir, "README.rst")).read()
@@ -38,12 +39,10 @@
3839
maintainer="The RIPE Atlas Team",
3940
maintainer_email="atlas@ripe.net",
4041
install_requires=install_requires,
41-
tests_require=tests_require,
4242
extras_require={
4343
"fast": ["ujson"],
4444
"doc": ["sphinx"]
4545
},
46-
test_suite="nose.collector",
4746
classifiers=[
4847
"Operating System :: POSIX",
4948
"Operating System :: Unix",

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ deps =
77
pytest
88
commands =
99
# flake8 --max-line-length=88 setup.py ripe/atlas/sagan/ tests/
10-
pytest -r a {posargs}
10+
pytest {posargs}

0 commit comments

Comments
 (0)