Skip to content

Commit 45d5bda

Browse files
committed
minor fixes + remove setup.py test command
1 parent 3ab9aa0 commit 45d5bda

3 files changed

Lines changed: 8 additions & 22 deletions

File tree

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012-2014 Georgi Valkov. All rights reserved.
1+
Copyright (c) 2012-2015 Georgi Valkov. All rights reserved.
22

33
Redistribution and use in source and binary forms, with or without
44
modification, are permitted provided that the following conditions are

requirements-dev.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pytest>=2.6.4

setup.py

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
from distutils.command.build import build
1010
from setuptools.command.develop import develop
1111
from setuptools.command.bdist_egg import bdist_egg
12-
from setuptools import setup, Extension, Command
12+
from setuptools import setup, Extension
1313

1414

15+
#-----------------------------------------------------------------------------
1516
here = abspath(dirname(__file__))
1617

18+
#-----------------------------------------------------------------------------
1719
classifiers = [
1820
'Development Status :: 5 - Production/Stable',
1921
'Programming Language :: Python :: 2.7',
2022
'Programming Language :: Python :: 3',
21-
'Programming Language :: Python :: 3.2',
2223
'Programming Language :: Python :: 3.3',
2324
'Programming Language :: Python :: 3.4',
2425
'Operating System :: POSIX :: Linux',
@@ -28,11 +29,13 @@
2829
'Programming Language :: Python :: Implementation :: CPython',
2930
]
3031

32+
#-----------------------------------------------------------------------------
3133
cflags = ['-std=c99', '-Wno-error=declaration-after-statement']
3234
input_c = Extension('evdev._input', sources=['evdev/input.c'], extra_compile_args=cflags)
3335
uinput_c = Extension('evdev._uinput', sources=['evdev/uinput.c'], extra_compile_args=cflags)
3436
ecodes_c = Extension('evdev._ecodes', sources=['evdev/ecodes.c'], extra_compile_args=cflags)
3537

38+
#-----------------------------------------------------------------------------
3639
kw = {
3740
'name': 'evdev',
3841
'version': '0.4.6',
@@ -50,7 +53,6 @@
5053

5154
'packages': ['evdev'],
5255
'ext_modules': [input_c, uinput_c, ecodes_c],
53-
'tests_require': ['pytest'],
5456

5557
'include_package_data': False,
5658
'zip_safe': True,
@@ -98,24 +100,7 @@ def run(self):
98100
create_ecodes()
99101
bdist_egg.run(self)
100102

101-
102-
class PyTest(Command):
103-
'''setup.py test -> py.test tests'''
104-
105-
user_options = []
106-
def initialize_options(self):
107-
pass
108-
109-
def finalize_options(self):
110-
pass
111-
112-
def run(self):
113-
from subprocess import call
114-
errno = call(('py.test', 'tests'))
115-
raise SystemExit(errno)
116-
117-
118-
kw['cmdclass']['test'] = PyTest
103+
#-----------------------------------------------------------------------------
119104
kw['cmdclass']['build'] = BuildCommand
120105
kw['cmdclass']['develop'] = DevelopCommand
121106
kw['cmdclass']['bdist_egg'] = BdistEggCommand

0 commit comments

Comments
 (0)