Skip to content

Commit 82c87d4

Browse files
jhavljhavl
committed
added req
1 parent fc2dab1 commit 82c87d4

File tree

1 file changed

+60
-94
lines changed

1 file changed

+60
-94
lines changed

‎setup.py

Lines changed: 60 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,33 @@
1010
here = os.path.abspath(os.path.dirname(__file__))
1111

1212
req = [
13-
'numpy>=1.18.0',
14-
'spatialmath-python>=0.11',
15-
'spatialgeometry>=0.2.0',
16-
'pgraph-python',
17-
'scipy',
18-
'matplotlib',
19-
'ansitable',
20-
'swift-sim>=0.10.0',
21-
'qpsolvers',
22-
'rtb-data'
13+
"numpy>=1.18.0",
14+
"spatialmath-python>=0.11",
15+
"spatialgeometry>=0.2.0",
16+
"pgraph-python",
17+
"scipy",
18+
"matplotlib",
19+
"ansitable",
20+
"swift-sim>=0.10.0",
21+
"qpsolvers",
22+
"rtb-data",
23+
"progress",
2324
]
2425

25-
collision_req = [
26-
'pybullet'
27-
]
26+
collision_req = ["pybullet"]
2827

29-
vp_req = [
30-
'vpython',
31-
'numpy-stl',
32-
'imageio',
33-
'imageio-ffmpeg'
34-
]
28+
vp_req = ["vpython", "numpy-stl", "imageio", "imageio-ffmpeg"]
3529

36-
dev_req = [
37-
'pytest',
38-
'pytest-cov',
39-
'flake8',
40-
'pyyaml',
41-
'sympy'
42-
]
30+
dev_req = ["pytest", "pytest-cov", "flake8", "pyyaml", "sympy"]
4331

4432
docs_req = [
45-
'sphinx',
46-
'sphinx_rtd_theme',
47-
'sphinx-autorun',
33+
"sphinx",
34+
"sphinx_rtd_theme",
35+
"sphinx-autorun",
4836
]
4937

5038
# Get the long description from the README file
51-
with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
39+
with open(os.path.join(here, "README.md"), encoding="utf-8") as f:
5240
long_description = f.read()
5341

5442
# list all data folders here, to ensure they get packaged
@@ -57,15 +45,15 @@
5745
# 'roboticstoolbox/models/URDF/xacro',
5846
# 'roboticstoolbox/models/DH/meshes',
5947
# 'roboticstoolbox/data',
60-
'roboticstoolbox/core',
48+
"roboticstoolbox/core",
6149
]
6250

6351

6452
def package_files(directory):
6553
paths = []
6654
for (pathhere, _, filenames) in os.walk(directory):
6755
for filename in filenames:
68-
paths.append(os.path.join('..', pathhere, filename))
56+
paths.append(os.path.join("..", pathhere, filename))
6957
return paths
7058

7159

@@ -74,87 +62,65 @@ def package_files(directory):
7462
extra_files += package_files(extra_folder)
7563

7664
frne = Extension(
77-
'frne',
65+
"frne",
7866
sources=[
79-
'./roboticstoolbox/core/vmath.c',
80-
'./roboticstoolbox/core/ne.c',
81-
'./roboticstoolbox/core/frne.c'],
82-
include_dirs=[
83-
'./roboticstoolbox/core/'
84-
])
67+
"./roboticstoolbox/core/vmath.c",
68+
"./roboticstoolbox/core/ne.c",
69+
"./roboticstoolbox/core/frne.c",
70+
],
71+
include_dirs=["./roboticstoolbox/core/"],
72+
)
8573

8674
fknm = Extension(
87-
'fknm',
88-
sources=[
89-
'./roboticstoolbox/core/fknm.c'],
90-
include_dirs=[
91-
'./roboticstoolbox/core/',
92-
numpy.get_include()
93-
])
75+
"fknm",
76+
sources=["./roboticstoolbox/core/fknm.c"],
77+
include_dirs=["./roboticstoolbox/core/", numpy.get_include()],
78+
)
9479

9580
setup(
96-
name='roboticstoolbox-python',
97-
98-
version='0.11.0',
99-
100-
description='A Python library for robotic education and research',
101-
81+
name="roboticstoolbox-python",
82+
version="0.11.0",
83+
description="A Python library for robotic education and research",
10284
long_description=long_description,
103-
104-
long_description_content_type='text/markdown',
105-
106-
url='https://github.com/petercorke/robotics-toolbox-python',
107-
108-
author='Jesse Haviland and Peter Corke',
109-
110-
license='MIT',
111-
85+
long_description_content_type="text/markdown",
86+
url="https://github.com/petercorke/robotics-toolbox-python",
87+
author="Jesse Haviland and Peter Corke",
88+
license="MIT",
11289
classifiers=[
11390
# 3 - Alpha
11491
# 4 - Beta
11592
# 5 - Production/Stable
116-
'Development Status :: 4 - Beta',
117-
93+
"Development Status :: 4 - Beta",
11894
# Indicate who your project is intended for
119-
'Intended Audience :: Developers',
95+
"Intended Audience :: Developers",
12096
# Pick your license as you wish (should match "license" above)
121-
'License :: OSI Approved :: MIT License',
122-
97+
"License :: OSI Approved :: MIT License",
12398
# Specify the Python versions you support here. In particular, ensure
12499
# that you indicate whether you support Python 2, Python 3 or both.
125-
'Programming Language :: Python :: 3.6',
126-
'Programming Language :: Python :: 3.7',
127-
'Programming Language :: Python :: 3.8',
128-
'Programming Language :: Python :: 3.9',
100+
"Programming Language :: Python :: 3.6",
101+
"Programming Language :: Python :: 3.7",
102+
"Programming Language :: Python :: 3.8",
103+
"Programming Language :: Python :: 3.9",
129104
],
130-
131-
python_requires='>=3.6',
132-
105+
python_requires=">=3.6",
133106
project_urls={
134-
'Documentation': 'https://petercorke.github.io/roboticstoolbox-python',
135-
'Source': 'https://github.com/petercorke/roboticstoolbox-python',
136-
'Tracker': 'https://github.com/petercorke/roboticstoolbox-python/issues',
137-
'Coverage': 'https://codecov.io/gh/petercorke/roboticstoolbox-python'
107+
"Documentation": "https://petercorke.github.io/roboticstoolbox-python",
108+
"Source": "https://github.com/petercorke/roboticstoolbox-python",
109+
"Tracker": "https://github.com/petercorke/roboticstoolbox-python/issues",
110+
"Coverage": "https://codecov.io/gh/petercorke/roboticstoolbox-python",
138111
},
139-
140112
ext_modules=[frne, fknm],
141-
142-
keywords='python robotics robotics-toolbox kinematics dynamics' \
143-
' motion-planning trajectory-generation jacobian hessian' \
144-
' control simulation robot-manipulator mobile-robot',
145-
113+
keywords="python robotics robotics-toolbox kinematics dynamics"
114+
" motion-planning trajectory-generation jacobian hessian"
115+
" control simulation robot-manipulator mobile-robot",
146116
packages=find_packages(exclude=["tests", "notebooks"]),
147-
148-
package_data={'roboticstoolbox': extra_files},
149-
150-
scripts=['roboticstoolbox/bin/rtbtool'],
151-
117+
package_data={"roboticstoolbox": extra_files},
118+
scripts=["roboticstoolbox/bin/rtbtool"],
152119
install_requires=req,
153-
154120
extras_require={
155-
'collision': collision_req,
156-
'dev': dev_req,
157-
'docs': docs_req,
158-
'vpython': vp_req
159-
}
121+
"collision": collision_req,
122+
"dev": dev_req,
123+
"docs": docs_req,
124+
"vpython": vp_req,
125+
},
160126
)

0 commit comments

Comments
 (0)