Skip to content

Commit

Permalink
fix dependencies
Browse files Browse the repository at this point in the history
- 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

allow dedicated apphub url

allow dedicated apphub url

runtime export: allow override action
  • Loading branch information
miraculixx committed Oct 15, 2022
1 parent 9618f7a commit 22e258f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -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+))?
Expand Down
2 changes: 1 addition & 1 deletion omegaml/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.15.2-rc1
0.15.2-rc4
2 changes: 1 addition & 1 deletion omegaml/client/cli/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def process(specs_file, action='plan', dry=False, select=None, specs=None, cli_l
logger = cli_logger or module_logger
order = COMMAND_ORDER
commands = []
vars = dict(action=action, dry=dry, select=select)
vars = dict(dry=dry, select=select)
vars.update({**os.environ, **DEFAULT_VARS})
selected = (select or '').split(',')
specs = dict([pair.strip().split('=', 1) for pair in specs.split(',')]) if specs else {}
Expand Down
4 changes: 2 additions & 2 deletions omegaml/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit 22e258f

Please sign in to comment.