Merge pull request #79 from iterait/dev

Release 0.2.2

.circleci/config.yml

@@ -14,7 +14,7 @@ references:
     run:
       name: Install dependencies on Arch Linux.
       command: |
-        pacman -Syu --noconfirm python python-numpy python-pip git curl
+        pacman -Syu --noconfirm --needed python python-numpy python-pip git curl base-devel
         pip install coveralls coverage
 
   ubuntu_deps_extra_pkgs: &ubuntu_deps_extra_pkgs
@@ -31,7 +31,7 @@ references:
     run:
       name: Install opencv & scikit dependencies on Arch Linux.
       command: |
-        pacman -Syu --noconfirm opencv hdf5 gtk3 python-scikit-learn
+        pacman -Syu --noconfirm --needed opencv qt5-base hdf5 gtk3 python-scikit-learn
         echo 'export EXTRA_PKGS=true' >> $BASH_ENV
 
   install: &install

emloop/__init__.py

@@ -18,4 +18,4 @@
            'load_yaml', 'AbstractDataset', 'BaseDataset', 'DownloadableDataset', 'AbstractHook', 'MainLoop',
            'AbstractModel', 'Batch', 'Stream', 'EpochData', 'TimeProfile']
 
-__version__ = '0.2.1'
+__version__ = '0.2.2'

emloop/tests/api_test.py

@@ -25,7 +25,7 @@
 class DummyDataset:
     """Dummy dataset which loads the given config to self.config."""
     def __init__(self, config_str):
-        self.config = ruamel.yaml.load(config_str)
+        self.config = ruamel.yaml.safe_load(config_str)
 
     def train_stream(self):
         yield {'a': ['b']}
@@ -35,7 +35,7 @@ class DummyConfigDataset(AbstractDataset):
     """Dummy dataset which changes config."""
     def __init__(self, config_str: str):
         super().__init__(config_str)
-        config = ruamel.yaml.load(config_str)['dataset_config']
+        config = ruamel.yaml.safe_load(config_str)['dataset_config']
         config[0], config[1], config[2] = config[1], config[0], config[2]
 
     def train_stream(self):

emloop/tests/utils/yaml_test.py

@@ -50,4 +50,4 @@ def test_dump_yaml(tmpdir):
 
     # test dump to string (effectively, test pyaml)
     yaml_str = yaml_to_str(config)
-    assert ruamel.yaml.load(yaml_str) == config
+    assert ruamel.yaml.safe_load(yaml_str) == config

emloop/utils/__init__.py

@@ -1,5 +1,5 @@
 from .config import parse_arg, load_config
-from .yaml import yaml_to_file, yaml_to_str
+from .yaml import yaml_to_file, yaml_to_str, load_yaml
 from .download import maybe_download_and_extract
 from .misc import DisabledLogger, DisabledPrint, CaughtInterrupts, ReleasedSemaphore
 from .profile import Timer

setup.py

@@ -5,7 +5,7 @@
 ]
 
 setup(name='emloop',
-      version='0.2.1',
+      version='0.2.2',
       description='Smart machine learning trainer',
       long_description='Trainer of machine learning models that automatically manages the whole process of training,'
                        'saving and restoring models and much more',