Skip to content

Commit 21a1181

Browse files
committed
Topologically order travis-requirements.txt
This removes the need for a $ROBOTPY_NO_DEPS variable here.
1 parent 15f7e1f commit 21a1181

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
with open(join(setup_dir, 'README.rst'), 'r') as readme_file:
4141
long_description = readme_file.read()
4242

43-
install_requires = ['wpilib>=2018.1.5,<2019.0.0', 'pynetworktables>=2018.1.0']
44-
4543
setup(
4644
name='robotpy-wpilib-utilities',
4745
version=__version__,
@@ -51,7 +49,7 @@
5149
author_email='robotpy@googlegroups.com',
5250
url='https://github.com/robotpy/robotpy-wpilib-utilities',
5351
keywords='frc first robotics',
54-
install_requires=install_requires if not os.environ.get('ROBOTPY_NO_DEPS') else None,
52+
install_requires=['pynetworktables>=2018.1.0', 'wpilib>=2018.1.5,<2019.0.0'],
5553
packages=find_packages(),
5654
license='BSD',
5755
classifiers=[

travis-requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
git+git://github.com/robotpy/pynetworktables.git
33

4-
git+git://github.com/robotpy/robotpy-wpilib.git#subdirectory=wpilib
54
git+git://github.com/robotpy/robotpy-wpilib.git#subdirectory=hal-base
65
git+git://github.com/robotpy/robotpy-wpilib.git#subdirectory=hal-sim
7-
8-
git+git://github.com/robotpy/pyfrc.git
6+
git+git://github.com/robotpy/robotpy-wpilib.git#subdirectory=wpilib
97

108
-e .
119

10+
git+git://github.com/robotpy/pyfrc.git
11+
1212
pytest>=2.8
1313
coverage

0 commit comments

Comments
 (0)