Skip to content

Commit f22e237

Browse files
acabarbayeacabarbaye
committed
added classifiers in the different packages
1 parent 2898ddf commit f22e237

File tree

9 files changed

+78
-25
lines changed

9 files changed

+78
-25
lines changed

‎packages/mbed-greentea/requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mbed-os-tools>=0.0.9,<0.1.0
2+
mbed-host-tests>=1.5.0,<2

‎packages/mbed-greentea/setup.py

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,29 @@
2727
from distutils.core import setup
2828
from setuptools import find_packages
2929

30-
3130
DESCRIPTION = "mbed 3.0 onwards test suite, codename Greentea. The test suite is a collection of tools that enable automated testing on mbed-enabled platforms"
3231
OWNER_NAMES = 'Anna Bridge, Qinghao Shi'
3332
OWNER_EMAILS = '[email protected], [email protected]'
3433

34+
repository_dir = os.path.dirname(__file__)
35+
3536

3637
def read(fname):
3738
"""
3839
Utility function to cat in a file (used for the README)
3940
@param fname: the name of the file to read, relative to the directory containing this file
4041
@return: The string content of the opened file
4142
"""
42-
return open(os.path.join(os.path.dirname(__file__), fname), encoding="utf-8").read()
43+
with open(os.path.join(repository_dir, fname),
44+
encoding="utf8") as f:
45+
return f.read()
46+
47+
48+
with open(os.path.join(repository_dir, 'requirements.txt')) as fh:
49+
requirements = fh.readlines()
4350

51+
with open(os.path.join(repository_dir, 'test_requirements.txt')) as fh:
52+
test_requirements = fh.readlines()
4453

4554
setup(name='mbed-greentea',
4655
version='1.7.3',
@@ -56,13 +65,24 @@ def read(fname):
5665
license="Apache-2.0",
5766
test_suite='test',
5867
entry_points={
59-
"console_scripts": ["mbedgt=mbed_greentea.mbed_greentea_cli:main",],
68+
"console_scripts": ["mbedgt=mbed_greentea.mbed_greentea_cli:main", ],
6069
},
61-
install_requires=[
62-
"mbed-os-tools>=0.0.9,<0.1.0",
63-
"mbed-host-tests>=1.5.0,<2"
64-
],
65-
tests_require=[
66-
"mock>=2"
67-
]
70+
classifiers=(
71+
'Development Status :: 5 - Production/Stable',
72+
'Intended Audience :: Developers',
73+
'License :: OSI Approved :: Apache Software License',
74+
'Programming Language :: Python :: 2',
75+
'Programming Language :: Python :: 2.7',
76+
'Programming Language :: Python :: 3',
77+
'Programming Language :: Python :: 3.5',
78+
'Programming Language :: Python :: 3.6',
79+
'Programming Language :: Python :: 3.7',
80+
'Programming Language :: Python',
81+
'Topic :: Software Development :: Build Tools',
82+
'Topic :: Software Development :: Embedded Systems',
83+
'Topic :: Software Development :: Testing',
84+
),
85+
python_requires='>=2.7.10, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
86+
install_requires=requirements,
87+
tests_require=test_requirements
6888
)

‎packages/mbed-greentea/test_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
mock>=2
12
coverage
23
coveralls

‎packages/mbed-host-tests/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mbed-os-tools>=0.0.9,<0.1.0

‎packages/mbed-host-tests/setup.py

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,25 @@
3131
OWNER_NAMES = 'Qinghao Shi'
3232
OWNER_EMAILS = '[email protected]'
3333

34+
repository_dir = os.path.dirname(__file__)
35+
3436

3537
def read(fname):
3638
"""
3739
Utility function to cat in a file (used for the README)
3840
@param fname: the name of the file to read, relative to the directory containing this file
3941
@return: The string content of the opened file
4042
"""
41-
return open(os.path.join(os.path.dirname(__file__), fname), encoding="utf8").read()
43+
with open(os.path.join(repository_dir, fname),
44+
encoding="utf8") as f:
45+
return f.read()
46+
47+
48+
with open(os.path.join(repository_dir, 'requirements.txt')) as fh:
49+
requirements = fh.readlines()
4250

51+
with open(os.path.join(repository_dir, 'test_requirements.txt')) as fh:
52+
test_requirements = fh.readlines()
4353

4454
setup(name='mbed-host-tests',
4555
version='1.5.9',
@@ -55,14 +65,26 @@ def read(fname):
5565
license="Apache-2.0",
5666
test_suite='test',
5767
entry_points={
58-
"console_scripts":
59-
["mbedhtrun=mbed_host_tests.mbedhtrun:main",
60-
"mbedflsh=mbed_host_tests.mbedflsh:main"],
68+
"console_scripts":
69+
["mbedhtrun=mbed_host_tests.mbedhtrun:main",
70+
"mbedflsh=mbed_host_tests.mbedflsh:main"],
6171
},
62-
install_requires=[
63-
"mbed-os-tools>=0.0.9,<0.1.0"
64-
],
65-
tests_require=[
66-
"mock>=2"
67-
]
72+
classifiers=(
73+
'Development Status :: 5 - Production/Stable',
74+
'Intended Audience :: Developers',
75+
'License :: OSI Approved :: Apache Software License',
76+
'Programming Language :: Python :: 2',
77+
'Programming Language :: Python :: 2.7',
78+
'Programming Language :: Python :: 3',
79+
'Programming Language :: Python :: 3.5',
80+
'Programming Language :: Python :: 3.6',
81+
'Programming Language :: Python :: 3.7',
82+
'Programming Language :: Python',
83+
'Topic :: Software Development :: Build Tools',
84+
'Topic :: Software Development :: Embedded Systems',
85+
'Topic :: Software Development :: Testing',
86+
),
87+
python_requires='>=2.7.10, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
88+
install_requires=requirements,
89+
tests_require=test_requirements
6890
)

‎packages/mbed-host-tests/test_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
mock>=2
12
coverage
23
coveralls

‎packages/mbed-ls/setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
repository_dir = os.path.dirname(__file__)
3232

33+
3334
def read(fname):
3435
"""
3536
Utility function to cat in a file (used for the README)
@@ -44,6 +45,9 @@ def read(fname):
4445
with open(os.path.join(repository_dir, 'requirements.txt')) as fh:
4546
requirements = fh.readlines()
4647

48+
with open(os.path.join(repository_dir, 'test_requirements.txt')) as fh:
49+
test_requirements = fh.readlines()
50+
4751
setup(name='mbed-ls',
4852
version='1.7.9',
4953
description=DESCRIPTION,
@@ -78,10 +82,7 @@ def read(fname):
7882
],
7983
},
8084
install_requires=requirements,
81-
tests_require=[
82-
"mock>=2",
83-
"pytest>=3"
84-
],
85+
tests_require=test_requirements,
8586
extras_require={
8687
"colorized_logs": ["colorlog"]
8788
}

‎packages/mbed-ls/test_requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
mock>=2
2+
pytest>=3
13
coverage
24
coveralls

‎setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ def read(fname):
3838
with open(os.path.join(repository_dir, 'requirements.txt')) as fh:
3939
requirements = fh.readlines()
4040

41+
with open(os.path.join(repository_dir, 'test_requirements.txt')) as fh:
42+
test_requirements = fh.readlines()
43+
4144
setup(
4245
name="mbed-os-tools",
4346
version=read("src/mbed_os_tools/VERSION.txt").strip(),
@@ -70,7 +73,7 @@ def read(fname):
7073
),
7174
python_requires='>=2.7.10, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
7275
install_requires=requirements,
73-
tests_require=read("test_requirements.txt").splitlines(),
76+
tests_require=test_requirements,
7477
extras_require={
7578
"pyocd": ["pyocd==0.14.0"]
7679
},

0 commit comments

Comments
 (0)