Move to pytest and get rid of pipenv.

Author: MillionIntegrals

.gitignore

@@ -115,3 +115,6 @@ environment.yaml
 
 # Word embedding cache
 /.vector_cache
+
+# Test cache
+/.pytest_cache

Makefile

@@ -0,0 +1,2 @@
+test:
+	pytest .

requirements.txt

@@ -0,0 +1,61 @@
+atari-py==0.1.7
+atomicwrites==1.3.0
+attrs==19.1.0
+bleach==3.1.0
+box2d-py==2.3.8
+certifi==2019.3.9
+chardet==3.0.4
+cloudpickle==0.8.0
+cymem==2.0.2
+cytoolz==0.9.0.1
+dill==0.2.9
+dnspython==1.16.0
+docutils==0.14
+future==0.17.1
+gym==0.12.0
+idna==2.8
+more-itertools==6.0.0
+msgpack==0.5.6
+msgpack-numpy==0.4.3.2
+murmurhash==1.0.2
+numpy==1.16.2
+opencv-python==4.0.0.21
+pandas==0.24.1
+Pillow==5.4.1
+pkginfo==1.5.0.1
+plac==0.9.6
+pluggy==0.9.0
+preshed==2.0.1
+py==1.8.0
+pyglet==1.3.2
+Pygments==2.3.1
+pymongo==3.7.2
+PyOpenGL==3.1.0
+pytest==4.3.1
+python-dateutil==2.8.0
+pytz==2018.9
+PyYAML==5.1
+pyzmq==18.0.1
+readme-renderer==24.0
+regex==2018.1.10
+requests==2.21.0
+requests-toolbelt==0.9.1
+scikit-learn==0.20.3
+scipy==1.2.1
+six==1.12.0
+spacy==2.0.18
+thinc==6.12.1
+toolz==0.9.0
+torch==1.0.1.post2
+torchfile==0.1.0
+torchtext==0.3.1
+torchvision==0.2.2.post3
+tornado==6.0.1
+tqdm==4.31.1
+twine==1.13.0
+ujson==1.35
+urllib3==1.24.1
+visdom==0.1.8.8
+webencodings==0.5.1
+websocket-client==0.55.0
+wrapt==1.10.11

setup.cfg

@@ -1,2 +1,5 @@
 [metadata]
-description-file = README.md
+description-file = README.md
+
+[aliases]
+test=pytest

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name='vel',
-    version='0.2.2',
+    version='0.3.0',
     description="Velocity in deep-learning research",
     long_description=long_description,
     url='https://github.com/MillionIntegrals/vel',
@@ -33,7 +33,7 @@
         'pandas',
         'pyyaml',
         'scikit-learn',
-        'torch == 1.0',
+        'torch ~= 1.0',
         'torchvision',
         'torchtext',
         'tqdm'
@@ -43,9 +43,13 @@
         'mongo': ['pymongo', 'dnspython'],
         'gym': ['gym[atari,box2d,classic_control]'],
         'mujoco': ['gym[mujoco,robotics]'],
-        'dev': ['nose'],
-        'text': ['spacy']
+        'dev': ['pytest'],
+        'text': ['spacy'],
+        'all': ['visdom', 'pymongo', 'dnspython', 'gym[all]', 'pytest', 'spacy']
     },
+    tests_require=[
+        'pytest'
+    ],
     entry_points={
         'console_scripts': [
             'vel = vel.launcher:main',

travis-requirements.txt

@@ -1,69 +1,61 @@
 atari-py==0.1.7
-attrs==18.2.0
-bleach==3.0.2
-Box2D==2.3.2
+atomicwrites==1.3.0
+attrs==19.1.0
+bleach==3.1.0
 box2d-py==2.3.8
-certifi==2018.10.15
-cffi==1.11.5
+certifi==2019.3.9
 chardet==3.0.4
-cloudpickle==0.6.1
-cycler==0.10.0
+cloudpickle==0.8.0
 cymem==2.0.2
-Cython==0.29.1
 cytoolz==0.9.0.1
-dill==0.2.8.2
-dnspython==1.15.0
+dill==0.2.9
+dnspython==1.16.0
 docutils==0.14
 future==0.17.1
-glfw==1.7.0
-gym==0.10.9
-idna==2.7
-imageio==2.4.1
-kiwisolver==1.0.1
-lockfile==0.12.2
-matplotlib==3.0.2
+gym==0.12.0
+idna==2.8
+more-itertools==6.0.0
 msgpack==0.5.6
 msgpack-numpy==0.4.3.2
-murmurhash==1.0.1
-nose==1.3.7
-numpy==1.15.4
-opencv-python==3.4.3.18
-pandas==0.23.4
-Pillow==5.3.0
-Pillow-SIMD==5.3.0.post0
-pkginfo==1.4.2
+murmurhash==1.0.2
+numpy==1.16.2
+opencv-python==4.0.0.21
+pandas==0.24.1
+Pillow==5.4.1
+pkginfo==1.5.0.1
 plac==0.9.6
+pluggy==0.9.0
 preshed==2.0.1
-pycparser==2.19
+py==1.8.0
 pyglet==1.3.2
-Pygments==2.2.0
+Pygments==2.3.1
 pymongo==3.7.2
 PyOpenGL==3.1.0
-pyparsing==2.3.0
-python-dateutil==2.7.5
-pytz==2018.7
-PyYAML==3.13
-pyzmq==17.1.2
+pytest==4.3.1
+python-dateutil==2.8.0
+pytz==2018.9
+PyYAML==5.1
+pyzmq==18.0.1
 readme-renderer==24.0
-regex==2017.11.9
-requests==2.20.1
-requests-toolbelt==0.8.0
-scikit-learn==0.20.1
-scipy==1.1.0
-six==1.11.0
-spacy==2.0.17
-thinc==6.12.0
+regex==2018.1.10
+requests==2.21.0
+requests-toolbelt==0.9.1
+scikit-learn==0.20.3
+scipy==1.2.1
+six==1.12.0
+spacy==2.0.18
+thinc==6.12.1
 toolz==0.9.0
-torch==0.4.1
+torch==1.0.1.post2
 torchfile==0.1.0
 torchtext==0.3.1
-torchvision==0.2.1
-tornado==5.1.1
-tqdm==4.28.1
-twine==1.12.1
+torchvision==0.2.2.post3
+tornado==6.0.1
+tqdm==4.31.1
+twine==1.13.0
 ujson==1.35
 urllib3==1.24.1
-visdom==0.1.8.5
+visdom==0.1.8.8
 webencodings==0.5.1
-websocket-client==0.54.0
+websocket-client==0.55.0
 wrapt==1.10.11

vel/internals/tests/test_parser.py

@@ -1,55 +1,47 @@
-import nose.tools as t
+import pytest
 
 import vel.internals.parser as v
 
 
+@pytest.fixture
 def setup_parser():
     """ Set up test environment """
     v.Parser.register()
 
 
-@t.with_setup(setup_parser)
-def test_variable_parsing():
-    v.Parser.register()
-
+def test_variable_parsing(setup_parser):
     yaml_text = """
 x:
   y: !param xxx 
 """
 
     yaml_contents = v.Parser.parse(yaml_text)
 
-    t.assert_is_instance(yaml_contents['x']['y'], v.Parameter)
-    t.assert_equal(yaml_contents['x']['y'].name, 'xxx')
+    assert isinstance(yaml_contents['x']['y'], v.Parameter)
+    assert yaml_contents['x']['y'].name == 'xxx'
 
 
-@t.with_setup(setup_parser)
-def test_env_variable_parsing():
-    v.Parser.register()
-
+def test_env_variable_parsing(setup_parser):
     yaml_text = """
 x:
   y: !env xxx 
 """
 
     yaml_contents = v.Parser.parse(yaml_text)
 
-    t.assert_is_instance(yaml_contents['x']['y'], v.EnvironmentVariable)
-    t.assert_equal(yaml_contents['x']['y'].name, 'xxx')
+    assert isinstance(yaml_contents['x']['y'], v.EnvironmentVariable)
+    assert yaml_contents['x']['y'].name == 'xxx'
 
 
-@t.with_setup(setup_parser)
-def test_variable_default_values():
-    v.Parser.register()
-
+def test_variable_default_values(setup_parser):
     yaml_text = """
 x:
   y: !param xxx = 5
 """
 
     yaml_contents = v.Parser.parse(yaml_text)
 
-    t.assert_equal(yaml_contents['x']['y'].default_value, 5)
+    assert yaml_contents['x']['y'].default_value == 5
 
     yaml_text = """
 x:
@@ -58,7 +50,7 @@ def test_variable_default_values():
 
     yaml_contents = v.Parser.parse(yaml_text)
 
-    t.assert_equal(yaml_contents['x']['y'].default_value, 'abc')
+    assert yaml_contents['x']['y'].default_value == 'abc'
 
     yaml_text = """
 x:
@@ -67,7 +59,7 @@ def test_variable_default_values():
 
     yaml_contents = v.Parser.parse(yaml_text)
 
-    t.assert_equal(yaml_contents['x']['y'].default_value, 'abc def')
+    assert yaml_contents['x']['y'].default_value == 'abc def'
 
     yaml_text = """
 x:
@@ -76,7 +68,7 @@ def test_variable_default_values():
 
     yaml_contents = v.Parser.parse(yaml_text)
 
-    t.assert_equal(yaml_contents['x']['y'].default_value, None)
+    assert yaml_contents['x']['y'].default_value == None
 
     yaml_text = """
 x:
@@ -85,16 +77,15 @@ def test_variable_default_values():
 
     yaml_contents = v.Parser.parse(yaml_text)
 
-    t.assert_equal(yaml_contents['x']['y'].default_value, v.DUMMY_VALUE)
+    assert yaml_contents['x']['y'].default_value == v.DUMMY_VALUE
 
 
 def test_parse_equality():
-    t.assert_equal(v.Parser.parse_equality("x=5"), ('x', 5))
-    t.assert_equal(v.Parser.parse_equality("  x   =   5  "), ('x', 5))
+    assert v.Parser.parse_equality("x=5") == ('x', 5)
+    assert v.Parser.parse_equality("  x   =   5  ") == ('x', 5)
 
-    with t.assert_raises(AssertionError):
+    with pytest.raises(AssertionError):
         v.Parser.parse_equality("  1   =   2  ")
 
-    t.assert_equal(v.Parser.parse_equality("  'asd'   =   'www zzz'  "), ('asd', 'www zzz'))
-
-    t.assert_equal(v.Parser.parse_equality("  'asd'   =   'www=zzz'  "), ('asd', 'www=zzz'))
+    assert v.Parser.parse_equality("  'asd'   =   'www zzz'  ") == ('asd', 'www zzz')
+    assert v.Parser.parse_equality("  'asd'   =   'www=zzz'  ") == ('asd', 'www=zzz')