Skip to content

Commit

Permalink
gordo.client~=0.2.12,gordo-dataset~=2.4.0 (#1118)
Browse files Browse the repository at this point in the history
* gordo.client~=0.2.9,gordo-dataset~=2.4.0

* Fixing test_machine_from_config unittest

* Fixing unittests

* gordo.client~=0.2.11

* gordo-client==0.2.12
  • Loading branch information
koropets authored Jan 27, 2021
1 parent c8bc8aa commit 2aa6554
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 14 deletions.
6 changes: 3 additions & 3 deletions requirements/full_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ click==7.1.2 # via -r requirements.in, databricks-cli, flask, gordo
cloudpickle==1.2.2 # via mlflow
configparser==4.0.2 # via databricks-cli
contextlib2==0.6.0.post1 # via azureml-core
cryptography==2.8 # via adal, azure-identity, azure-storage-blob, azureml-core, pyjwt, pyopenssl, secretstorage
cryptography==3.3.1 # via adal, azure-identity, azure-storage-blob, azureml-core, gordo-dataset, pyjwt, pyopenssl, secretstorage
cycler==0.10.0 # via matplotlib
databricks-cli==0.9.1 # via mlflow
dataclasses-json==0.3.7 # via -r requirements.in
Expand All @@ -52,8 +52,8 @@ gitpython==3.0.5 # via mlflow
google-auth-oauthlib==0.4.1 # via tensorboard
google-auth==1.10.1 # via google-auth-oauthlib, tensorboard
google-pasta==0.1.8 # via tensorflow
gordo-dataset==2.3.6 # via -r requirements.in, gordo.client
gordo.client==0.2.5 # via -r requirements.in
gordo-dataset==2.4.0 # via -r requirements.in, gordo.client
gordo.client==0.2.12 # via -r requirements.in
gorilla==0.3.0 # via mlflow
graphviz==0.13.2 # via catboost
grpcio==1.26.0 # via tensorboard, tensorflow
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ typing_extensions~=3.7
prometheus_client~=0.7.1
azure-identity~=1.4.0
PyYAML~=5.3.1
gordo-dataset~=2.3.6
gordo-dataset~=2.4.0
jeepney>=0.6
packaging~=20.7
pydantic~=1.7.3
gordo.client~=0.2.5
gordo.client~=0.2.12
1 change: 1 addition & 0 deletions requirements/test_requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ urllib3>=1.24.2,<2.0
pytest-benchmark~=3.2
mock~=3.0
influxdb~=5.3.0
packaging~=20.7
15 changes: 9 additions & 6 deletions requirements/test_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@ bleach==3.1.5 # via -r test_requirements.in, nbconvert
certifi==2019.11.28 # via -c full_requirements.txt, requests
cffi==1.13.2 # via -c full_requirements.txt, cryptography
chardet==3.0.4 # via -c full_requirements.txt, requests
click==7.0 # via -c full_requirements.txt, black
click==7.1.2 # via -c full_requirements.txt, black
coverage==5.0.3 # via pytest-cov
cryptography==2.8 # via -c full_requirements.txt, adal, pyjwt
cryptography==3.3.1 # via -c full_requirements.txt, adal, pyjwt
decorator==4.4.1 # via ipython, traitlets
defusedxml==0.6.0 # via nbconvert
docker==4.1.0 # via -c full_requirements.txt, -r test_requirements.in
entrypoints==0.3 # via -c full_requirements.txt, nbconvert
execnet==1.7.1 # via pytest-xdist
idna==2.8 # via -c full_requirements.txt, requests
importlib-metadata==1.4.0 # via -c full_requirements.txt, jsonschema, pluggy, pytest
influxdb==5.3.0 # via -c full_requirements.txt, -r test_requirements.in
ipykernel==5.1.3 # via ipywidgets, jupyter, jupyter-console, notebook, qtconsole
ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets
ipython==7.11.1 # via ipykernel, ipywidgets, jupyter-console
Expand All @@ -39,12 +40,13 @@ markupsafe==1.1.1 # via -c full_requirements.txt, jinja2
mistune==0.8.4 # via nbconvert
mock==3.0.5 # via -r test_requirements.in
more-itertools==8.1.0 # via -c full_requirements.txt, pytest, zipp
msgpack==0.6.1 # via -c full_requirements.txt, influxdb
mypy-extensions==0.4.3 # via -c full_requirements.txt, mypy
mypy==0.761 # via pytest-mypy
nbconvert==5.6.1 # via -r test_requirements.in, jupyter, notebook
nbformat==5.0.3 # via ipywidgets, nbconvert, notebook
notebook==6.0.2 # via -r test_requirements.in, jupyter, widgetsnbextension
packaging==20.0 # via bleach, pytest
packaging==20.7 # via -c full_requirements.txt, -r test_requirements.in, bleach, pytest
pandocfilters==1.4.2 # via nbconvert
parso==0.5.2 # via jedi
pexpect==4.7.0 # via ipython
Expand All @@ -70,13 +72,14 @@ pytest-mypy==0.4.2 # via -r test_requirements.in
pytest-timeout==1.3.4 # via -r test_requirements.in
pytest-xdist==1.31.0 # via -r test_requirements.in
pytest==5.3.2 # via -r test_requirements.in, pytest-benchmark, pytest-cov, pytest-flakes, pytest-forked, pytest-mock, pytest-mypy, pytest-timeout, pytest-xdist
python-dateutil==2.8.1 # via -c full_requirements.txt, adal, jupyter-client
python-dateutil==2.8.1 # via -c full_requirements.txt, adal, influxdb, jupyter-client
pytz==2019.3 # via -c full_requirements.txt, influxdb
pyzmq==18.1.1 # via jupyter-client, notebook
qtconsole==4.6.0 # via jupyter
requests==2.22.0 # via -c full_requirements.txt, adal, docker, responses
requests==2.22.0 # via -c full_requirements.txt, adal, docker, influxdb, responses
responses==0.10.9 # via -r test_requirements.in
send2trash==1.5.0 # via notebook
six==1.14.0 # via -c full_requirements.txt, bleach, cryptography, docker, jsonschema, mock, packaging, prompt-toolkit, pyrsistent, pytest-xdist, python-dateutil, responses, traitlets, websocket-client
six==1.14.0 # via -c full_requirements.txt, bleach, cryptography, docker, influxdb, jsonschema, mock, prompt-toolkit, pyrsistent, pytest-xdist, python-dateutil, responses, traitlets, websocket-client
terminado==0.8.3 # via notebook
testpath==0.4.4 # via nbconvert
toml==0.10.0 # via black
Expand Down
4 changes: 2 additions & 2 deletions tests/gordo/client/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ def test_client_get_dataset(gordo_project, metadata, ml_server):
dataset = client._get_dataset(client_machine, start, end)
assert dataset.row_filter_buffer_size == 0
assert dataset.n_samples_threshold == 0
assert dataset.low_threshold == -1000
assert dataset.high_threshold == 50000
assert dataset.low_threshold is None
assert dataset.high_threshold is None


def test_client_predict_specific_targets(gordo_project, gordo_single_target, ml_server):
Expand Down
3 changes: 2 additions & 1 deletion tests/gordo/workflow/test_config_elements.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ def test_machine_from_config(default_globals: dict):
"known_filter_periods": [],
"low_threshold": -1000,
"n_samples_threshold": 0,
"process_metadata": True,
"resolution": "10T",
"row_filter": "",
"row_filter_buffer_size": 0,
Expand All @@ -161,7 +162,7 @@ def test_machine_from_config(default_globals: dict):
"target_tag_list": ["GRA-TE -123-456"],
"train_end_date": "2018-01-02T09:00:30+00:00",
"train_start_date": "2018-01-01T09:00:30+00:00",
"type": "gordo_dataset.datasets.TimeSeriesDataset",
"type": "TimeSeriesDataset",
},
"evaluation": {
"cv_mode": "full_build",
Expand Down

0 comments on commit 2aa6554

Please sign in to comment.