Merge pull request #100 from auscompgeek/fix-reqs

Topologically order travis-requirements.txt

Author: virtuald

setup.py

@@ -40,8 +40,6 @@
 with open(join(setup_dir, 'README.rst'), 'r') as readme_file:
     long_description = readme_file.read()
 
-install_requires = ['wpilib>=2018.1.5,<2019.0.0', 'pynetworktables>=2018.1.0']
-
 setup(
     name='robotpy-wpilib-utilities',
     version=__version__,
@@ -51,7 +49,7 @@
     author_email='robotpy@googlegroups.com',
     url='https://github.com/robotpy/robotpy-wpilib-utilities',
     keywords='frc first robotics',
-    install_requires=install_requires if not os.environ.get('ROBOTPY_NO_DEPS') else None,
+    install_requires=['pynetworktables>=2018.1.0', 'wpilib>=2018.1.5,<2019.0.0'],
     packages=find_packages(),
     license='BSD',
     classifiers=[

travis-requirements.txt

@@ -1,13 +1,13 @@
 
-git+git://github.com/robotpy/pynetworktables.git
+git+git://github.com/robotpy/pynetworktables.git#egg=pynetworktables
 
-git+git://github.com/robotpy/robotpy-wpilib.git#subdirectory=wpilib
-git+git://github.com/robotpy/robotpy-wpilib.git#subdirectory=hal-base
-git+git://github.com/robotpy/robotpy-wpilib.git#subdirectory=hal-sim
-
-git+git://github.com/robotpy/pyfrc.git
+git+git://github.com/robotpy/robotpy-wpilib.git#egg=robotpy-hal-base&subdirectory=hal-base
+git+git://github.com/robotpy/robotpy-wpilib.git#egg=robotpy-hal-sim&subdirectory=hal-sim
+git+git://github.com/robotpy/robotpy-wpilib.git#egg=wpilib&subdirectory=wpilib
 
 -e .
 
+git+git://github.com/robotpy/pyfrc.git#egg=pyfrc
+
 pytest>=2.8
 coverage