Skip to content
This repository was archived by the owner on Nov 13, 2022. It is now read-only.

Commit bbac873

Browse files
benoit-pierrebenoit-pierre
committed
setup: move some things to setup.cfg
1 parent 2beb0bd commit bbac873

File tree

2 files changed

+82
-114
lines changed

2 files changed

+82
-114
lines changed

‎setup.cfg

+82
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,84 @@
1+
[metadata]
2+
author = Joshua Harlan Lifton
3+
author_email = joshua.harlan.lifton@gmail.com
4+
maintainer = Ted Morin
5+
maintainer_email = morinted@gmail.com
6+
classifiers =
7+
Programming Language :: Python :: 2
8+
Programming Language :: Python :: 2.7
9+
Programming Language :: Python :: 3
10+
Programming Language :: Python :: 3.4
11+
Programming Language :: Python :: 3.5
12+
License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
13+
Development Status :: 5 - Production/Stable
14+
Environment :: X11 Applications
15+
Environment :: MacOS X
16+
Environment :: Win32 (MS Windows)
17+
Intended Audience :: End Users/Desktop
18+
Natural Language :: English
19+
Operating System :: POSIX :: Linux
20+
Operating System :: MacOS :: MacOS X
21+
Operating System :: Microsoft :: Windows
22+
Topic :: Adaptive Technologies
23+
Topic :: Desktop Environment
24+
keywords = plover
25+
26+
[options]
27+
include_package_data = True
28+
zip_safe = True
29+
setup_requires =
30+
Babel
31+
pyqt-distutils
32+
setuptools-scm
33+
setuptools>=30.3.0
34+
tests_require =
35+
mock
36+
dependency_links =
37+
https://github.com/benoit-pierre/pyobjc/releases/download/pyobjc-3.1.1+plover2/pyobjc-core-3.1.1-plover2.tar.gz#egg=pyobjc-core
38+
https://github.com/benoit-pierre/pyobjc/releases/download/pyobjc-3.1.1+plover2/pyobjc-framework-Cocoa-3.1.1-plover2.tar.gz#egg=pyobjc-framework-Cocoa
39+
install_requires =
40+
appdirs>=1.3.0
41+
hidapi
42+
pyserial>=2.7
43+
setuptools
44+
six
45+
packages =
46+
plover
47+
plover.dictionary
48+
plover.gui_none
49+
plover.gui_qt
50+
plover.machine
51+
plover.oslayer
52+
plover.system
53+
54+
[options.entry_points]
55+
console_scripts =
56+
plover = plover.main:main
57+
plover.dictionary =
58+
json = plover.dictionary.json_dict:JsonDictionary
59+
rtf = plover.dictionary.rtfcre_dict:RtfDictionary
60+
plover.gui =
61+
none = plover.gui_none.main
62+
qt = plover.gui_qt.main
63+
plover.gui.qt.tool =
64+
add_translation = plover.gui_qt.add_translation:AddTranslation
65+
lookup = plover.gui_qt.lookup_dialog:LookupDialog
66+
paper_tape = plover.gui_qt.paper_tape:PaperTape
67+
suggestions = plover.gui_qt.suggestions_dialog:SuggestionsDialog
68+
plover.machine =
69+
Gemini PR = plover.machine.geminipr:GeminiPr
70+
Keyboard = plover.machine.keyboard:Keyboard
71+
Passport = plover.machine.passport:Passport
72+
ProCAT = plover.machine.procat:ProCAT
73+
Stentura = plover.machine.stentura:Stentura
74+
TX Bolt = plover.machine.txbolt:TxBolt
75+
Treal = plover.machine.treal:Treal
76+
plover.system =
77+
English Stenotype = plover.system.english_stenotype
78+
setuptools.installation =
79+
eggsecutable = plover.main:main
80+
181
[bdist_wheel]
282
universal = 1
83+
84+
# vim: commentstring=#\ %s list

‎setup.py

-114
Original file line numberDiff line numberDiff line change
@@ -353,75 +353,21 @@ def run(self):
353353
'tag_weekly': TagWeekly,
354354
'test': Test,
355355
}
356-
setup_requires = ['setuptools-scm']
357356
options = {}
358-
kwargs = {}
359357
build_dependencies = []
360358

361-
entrypoints = {
362-
'console_scripts': [
363-
'plover = plover.main:main',
364-
],
365-
366-
'plover.dictionary': [
367-
'json = plover.dictionary.json_dict:JsonDictionary',
368-
'rtf = plover.dictionary.rtfcre_dict:RtfDictionary',
369-
],
370-
371-
'plover.gui': [
372-
'none = plover.gui_none.main',
373-
],
374-
375-
'plover.machine': [
376-
'Gemini PR = plover.machine.geminipr:GeminiPr',
377-
'Keyboard = plover.machine.keyboard:Keyboard',
378-
'Passport = plover.machine.passport:Passport',
379-
'ProCAT = plover.machine.procat:ProCAT',
380-
'Stentura = plover.machine.stentura:Stentura',
381-
'TX Bolt = plover.machine.txbolt:TxBolt',
382-
'Treal = plover.machine.treal:Treal',
383-
],
384-
385-
'plover.system': [
386-
'English Stenotype = plover.system.english_stenotype',
387-
],
388-
389-
'setuptools.installation': [
390-
'eggsecutable = plover.main:main',
391-
],
392-
}
393-
394359
if sys.platform.startswith('darwin'):
395-
setup_requires.extend([
396-
'macholib',
397-
'pip',
398-
'wheel',
399-
])
400360
cmdclass['bdist_app'] = BinaryDistApp
401361
cmdclass['bdist_dmg'] = BinaryDistDmg
402362

403363
if sys.platform.startswith('win32'):
404-
setup_requires.extend([
405-
'pip',
406-
'wheel',
407-
])
408364
cmdclass['bdist_win'] = BinaryDistWin
409365

410-
setup_requires.append('pytest>=3.1.0')
411-
412-
entrypoints['plover.gui'].append('qt = plover.gui_qt.main')
413-
entrypoints['plover.gui.qt.tool'] = [
414-
'add_translation = plover.gui_qt.add_translation:AddTranslation',
415-
'lookup = plover.gui_qt.lookup_dialog:LookupDialog',
416-
'paper_tape = plover.gui_qt.paper_tape:PaperTape',
417-
'suggestions = plover.gui_qt.suggestions_dialog:SuggestionsDialog',
418-
]
419366
try:
420367
import PyQt5
421368
except ImportError:
422369
pass
423370
else:
424-
setup_requires.append('pyqt-distutils')
425371
try:
426372
from pyqt_distutils.build_ui import build_ui
427373
except ImportError:
@@ -448,7 +394,6 @@ def run(self):
448394
cmdclass['build_ui'] = BuildUi
449395
build_dependencies.append('build_ui')
450396

451-
setup_requires.append('Babel')
452397
try:
453398
from babel.messages import frontend as babel
454399
except ImportError:
@@ -480,18 +425,6 @@ def run(self):
480425
}
481426
build_dependencies.append('compile_catalog')
482427

483-
dependency_links = [
484-
'https://github.com/benoit-pierre/pyobjc/releases/download/pyobjc-3.1.1+plover2/pyobjc-core-3.1.1-plover2.tar.gz#egg=pyobjc-core',
485-
'https://github.com/benoit-pierre/pyobjc/releases/download/pyobjc-3.1.1+plover2/pyobjc-framework-Cocoa-3.1.1-plover2.tar.gz#egg=pyobjc-framework-Cocoa',
486-
]
487-
488-
install_requires = [
489-
'six',
490-
'setuptools',
491-
'pyserial>=2.7',
492-
'appdirs>=1.3.0',
493-
'hidapi',
494-
]
495428

496429
extras_require = {
497430
':"win32" in sys_platform': [
@@ -513,10 +446,6 @@ def run(self):
513446
],
514447
}
515448

516-
tests_require = [
517-
'mock',
518-
]
519-
520449

521450
class CustomBuildPy(build_py):
522451
def run(self):
@@ -535,54 +464,11 @@ def run(self):
535464
url=__url__,
536465
download_url=__download_url__,
537466
license=__license__,
538-
author='Joshua Harlan Lifton',
539-
author_email='joshua.harlan.lifton@gmail.com',
540-
maintainer='Ted Morin',
541-
maintainer_email='morinted@gmail.com',
542-
include_package_data=True,
543-
zip_safe=True,
544467
options=options,
545468
cmdclass=cmdclass,
546-
setup_requires=setup_requires,
547-
install_requires=install_requires,
548469
extras_require=extras_require,
549-
tests_require=tests_require,
550-
dependency_links=dependency_links,
551-
entry_points='\n'.join('[' + section + ']\n' + '\n'.join(
552-
entrypoint for entrypoint in entrypoint_list)
553-
for section, entrypoint_list in entrypoints.items()
554-
),
555-
packages=[
556-
'plover',
557-
'plover.dictionary',
558-
'plover.gui_none',
559-
'plover.gui_qt',
560-
'plover.machine',
561-
'plover.oslayer',
562-
'plover.system',
563-
],
564470
data_files=[
565471
('share/applications', ['application/plover.desktop']),
566472
('share/pixmaps', ['plover/assets/plover.png']),
567473
],
568-
classifiers=[
569-
'Programming Language :: Python :: 2',
570-
'Programming Language :: Python :: 2.7',
571-
'Programming Language :: Python :: 3',
572-
'Programming Language :: Python :: 3.4',
573-
'Programming Language :: Python :: 3.5',
574-
'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
575-
'Development Status :: 5 - Production/Stable',
576-
'Environment :: X11 Applications',
577-
'Environment :: MacOS X',
578-
'Environment :: Win32 (MS Windows)',
579-
'Intended Audience :: End Users/Desktop',
580-
'Natural Language :: English',
581-
'Operating System :: POSIX :: Linux',
582-
'Operating System :: MacOS :: MacOS X',
583-
'Operating System :: Microsoft :: Windows',
584-
'Topic :: Adaptive Technologies',
585-
'Topic :: Desktop Environment',
586-
],
587-
**kwargs
588474
)

0 commit comments

Comments
 (0)