Skip to content

Commit e9fd4a2

Browse files
benoit-pierrearxanas
authored andcommitted
setup: rework setup
- add shebang and make `setup.py` executable - use `plover_build_utils` - use `setup.cfg` for most metadata - add a manifest for correct source distribution - add keywords so plugin is recognized as such
1 parent 9bb34c4 commit e9fd4a2

File tree

5 files changed

+57
-159
lines changed

5 files changed

+57
-159
lines changed

MANIFEST.in

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# UI.
2+
exclude plover_wpm_meter/*_rc.py
3+
exclude plover_wpm_meter/*_ui.py
4+
include plover_wpm_meter/*.ui
5+
recursive-include plover_wpm_meter/resources *

plover_wpm_meter/strokes_meter_ui.py

-66
This file was deleted.

plover_wpm_meter/wpm_meter_ui.py

-66
This file was deleted.

setup.cfg

+35-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,35 @@
1-
[tool:pytest]
2-
python_paths = .
1+
[metadata]
2+
name = plover_wpm_meter
3+
version = 0.1
4+
description = A meter to show your typing speed in Plover
5+
long_description = file: README.md
6+
author = Waleed Khan
7+
author_email = [email protected]
8+
license = GNU General Public License v3 (GPLv3)
9+
url = https://github.com/arxanas/plover_wpm_meter
10+
classifiers =
11+
Development Status :: 4 - Beta
12+
Environment :: Plugins
13+
Intended Audience :: End Users/Desktop
14+
License :: OSI Approved :: GNU General Public License v3 (GPLv3)
15+
Operating System :: OS Independent
16+
Programming Language :: Python :: 3
17+
Programming Language :: Python :: 3.4
18+
Programming Language :: Python :: 3.5
19+
Programming Language :: Python :: 3.6
20+
keywords = plover plover_plugin
21+
22+
[options]
23+
zip_safe = True
24+
install_requires =
25+
plover>=4.0.0.dev2
26+
textstat>=0.3.1
27+
packages =
28+
plover_wpm_meter
29+
30+
[options.entry_points]
31+
plover.gui.qt.tool =
32+
wpm_meter = plover_wpm_meter:PloverWpmMeter
33+
strokes_meter = plover_wpm_meter:PloverStrokesMeter
34+
35+
# vim: commentstring=#\ %s list

setup.py

100644100755
+17-25
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
1-
from setuptools import find_packages, setup
1+
#!/usr/bin/env python3
22

3-
try:
4-
from pyqt_distutils.build_ui import build_ui
5-
cmdclass = {"build_ui": build_ui}
6-
except ImportError:
7-
cmdclass = {}
3+
__requires__ = '''
4+
plover>=4.0.0.dev2
5+
setuptools>=36.4.0
6+
'''
87

9-
setup(
10-
name="Plover: WPM and strokes meter",
11-
version="0.1",
12-
description="A meter to show your typing speed in Plover.",
13-
author="Waleed Khan",
14-
author_email="[email protected]",
15-
license="GPLv3",
16-
install_requires=[
17-
"plover>=4.0.0.dev0",
18-
"textstat>=0.3.1",
19-
],
20-
packages=find_packages(),
21-
entry_points="""
22-
[plover.gui.qt.tool]
23-
wpm_meter = plover_wpm_meter:PloverWpmMeter
24-
strokes_meter = plover_wpm_meter:PloverStrokesMeter
25-
""",
26-
cmdclass=cmdclass,
27-
)
8+
from setuptools import setup
9+
10+
from plover_build_utils.setup import BuildPy, BuildUi, Test
11+
12+
BuildPy.build_dependencies.append('build_ui')
13+
BuildUi.hooks = ['plover_build_utils.pyqt:fix_icons']
14+
cmdclass = {
15+
'build_py': BuildPy,
16+
'build_ui': BuildUi,
17+
}
18+
19+
setup(cmdclass=cmdclass)

0 commit comments

Comments
 (0)