fix dependencies

- kombu relies on deprecated importlib metadata,
celery/kombu#1601
- pass along qualifier to apphub when set
- drop nosetests

Bump version: 0.15.2-rc1 → 0.15.2-rc2
Bump version: 0.15.2-rc2 → 0.15.2-rc3
Bump version: 0.15.2-rc3 → 0.15.2-rc4

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.15.2-rc1
+current_version = 0.15.2-rc4
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)([-](?P<release>(dev|rc))+(?P<build>\d+))?

omegaml/VERSION

@@ -1 +1 @@
-0.15.2-rc1
+0.15.2-rc4

omegaml/client/cli/runtime.py

@@ -412,13 +412,15 @@ def restart(self):
         name = self.args.get('<name>')
         insecure = self.args.get('--insecure', False)
         user = om.runtime.auth.userid
+        qualifier = om.runtime.auth.qualifier
         auth = requests.auth.HTTPBasicAuth(user, om.runtime.auth.apikey)
+        headers = {'Qualifier': qualifier}
         parsed = urlparse(om.defaults.OMEGA_MONGO_URL)
         url = f'https://{parsed.hostname}'
         stop = requests.get(f'{url}/apps/api/stop/{user}/{name}'.format(om.runtime.auth.userid),
-                            auth=auth, verify=not insecure)
+                            auth=auth, verify=not insecure, headers=headers)
         start = requests.get(f'{url}/apps/api/start/{user}/{name}'.format(om.runtime.auth.userid),
-                             auth=auth, verify=not insecure)
+                             auth=auth, verify=not insecure, headers=headers)
         self.logger.info(f'stop: {stop} start: {start}')
 
     def serve(self):

omegaml/defaults.py

@@ -14,8 +14,8 @@
 truefalse = lambda v: (v if isinstance(v, bool) else
                        any(str(v).lower().startswith(c) for c in ('y', 't', '1')))
 is_cli_run = os.path.basename(sys.argv[0]) == 'om'
-is_test_run = truefalse(os.environ.get('OMEGA_TEST_MODE') or
-                        any('test' in basename(v) for v in sys.argv[:3]))
+is_test_run = truefalse(os.environ.get('OMEGA_TEST_MODE'))
+is_test_run |= any('test' in basename(v) for v in sys.argv[:3]) and Path(__file__).parent.parent == Path().cwd()
 
 #: configuration file, by default will be searched in current directory, user config or site config
 OMEGA_CONFIG_FILE = os.environ.get('OMEGA_CONFIG_FILE') or 'config.yml'

setup.py

@@ -17,7 +17,7 @@
 streaming_deps = ['minibatch[all]>=0.5.0']
 jupyter_deps = ['jupyterlab', 'jupyterhub==2.2.1']
 mlflow_deps = ['mlflow~=1.21']
-dev_deps = ['nose', 'twine', 'flake8', 'mock', 'behave', 'splinter', 'ipdb', 'bumpversion']
+dev_deps = ['pytest', 'twine', 'flake8', 'mock', 'behave', 'splinter', 'ipdb', 'bumpversion']
 
 # -- tensorflow specifics
 #    see https://www.tensorflow.org/install/source
@@ -80,6 +80,7 @@
     ],
     install_requires=[
         'celery>4.4,<5.0',
+        'importlib-metadata<5.0', # due to https://github.com/celery/kombu/pull/1601
         'joblib>=0.9.4',
         'jupyter-client>=4.1.1',
         'mongoengine~=0.24.1',