Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes by run-edgetest action #376

Merged
merged 3 commits into from
Aug 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
repos:
- repo: https://github.com/psf/black
rev: 22.10.0
hooks:
- id: black
exclude: (versioneer.py|_version.py)
- repo: https://github.com/psf/black
rev: 23.7.0
hooks:
- id: black
exclude: (versioneer.py|_version.py)

- repo: https://github.com/timothycrosley/isort
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/timothycrosley/isort
rev: 5.12.0
hooks:
- id: isort

- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.2
hooks:
- id: flake8
- repo: https://github.com/pycqa/flake8
rev: 6.1.0
hooks:
- id: flake8
10 changes: 5 additions & 5 deletions docs/docs-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ dependencies:

# install rubicon-ml dependencies
# so local pip install doesn't
- dash<=2.11.1,>=2.0.0
- dash-bootstrap-components<=1.4.1,>=1.0.0
- dash<=2.13.0,>=2.0.0
- dash-bootstrap-components<=1.4.2,>=1.0.0
- fsspec<=2023.6.0,>=2021.4.0
- intake[dataframe]<=0.7.0,>=0.5.2
- numpy<=1.25.1,>=1.22.0
- numpy<=1.25.2,>=1.22.0
- pandas<=2.0.3,>=1.0.0
- prefect<=1.2.4,>=0.12.0
- pyarrow<=12.0.1,>=0.18.0
- PyYAML<=6.0,>=5.4.0
- pyarrow<=13.0.0,>=0.18.0
- PyYAML<=6.0.1,>=5.4.0
- scikit-learn<=1.3.0,>=0.22.0
12 changes: 6 additions & 6 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ dependencies:
- python>=3.8
- pip

- click<=8.1.4,>=7.1
- click<=8.1.7,>=7.1
- fsspec<=2023.6.0,>=2021.4.0
- intake[dataframe]<=0.7.0,>=0.5.2
- numpy<=1.25.1,>=1.22.0
- numpy<=1.25.2,>=1.22.0
- pandas<=2.0.3,>=1.0.0
- pyarrow<=12.0.1,>=0.18.0
- PyYAML<=6.0,>=5.4.0
- pyarrow<=13.0.0,>=0.18.0
- PyYAML<=6.0.1,>=5.4.0
- scikit-learn<=1.3.0,>=0.22.0

# for prefect extras
Expand All @@ -21,8 +21,8 @@ dependencies:
- s3fs<=2023.6.0,>=0.4

# for viz extras
- dash<=2.11.1,>=2.0.0
- dash-bootstrap-components<=1.4.1,>=1.0.0
- dash<=2.13.0,>=2.0.0
- dash-bootstrap-components<=1.4.2,>=1.0.0

# for testing
- black
Expand Down
2 changes: 1 addition & 1 deletion rubicon_ml/sklearn/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def make_pipeline(
steps = _name_estimators(steps)
user_defined_loggers = _name_loggers(steps, loggers)

if type(project) != Project:
if not isinstance(project, Project):
raise ValueError(
"project" + str(project) + " must be of type rubicon_ml.client.project.Project"
)
Expand Down
20 changes: 10 additions & 10 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ zip_safe = False
include_package_data = True
packages = find:
install_requires =
click<=8.1.4,>=7.1
click<=8.1.7,>=7.1
fsspec<=2023.6.0,>=2021.4.0
intake[dataframe]<=0.7.0,>=0.5.2
numpy<=1.25.1,>=1.22.0
numpy<=1.25.2,>=1.22.0
pandas<=2.0.3,>=1.0.0
pyarrow<=12.0.1,>=0.18.0
PyYAML<=6.0,>=5.4.0
pyarrow<=13.0.0,>=0.18.0
PyYAML<=6.0.1,>=5.4.0
scikit-learn<=1.3.0,>=0.22.0

[options.extras_require]
Expand All @@ -43,14 +43,14 @@ prefect =
s3 =
s3fs<=2023.6.0,>=0.4
ui =
dash<=2.11.1,>=2.0.0
dash-bootstrap-components<=1.4.1,>=1.0.0
dash<=2.13.0,>=2.0.0
dash-bootstrap-components<=1.4.2,>=1.0.0
viz =
dash<=2.11.1,>=2.0.0
dash-bootstrap-components<=1.4.1,>=1.0.0
dash<=2.13.0,>=2.0.0
dash-bootstrap-components<=1.4.2,>=1.0.0
all =
dash<=2.11.1,>=2.0.0
dash-bootstrap-components<=1.4.1,>=1.0.0
dash<=2.13.0,>=2.0.0
dash-bootstrap-components<=1.4.2,>=1.0.0
prefect<=1.2.4,>=0.12.0
s3fs<=2023.6.0,>=0.4

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/repository/test_local_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def test_initialization():
local_repo = LocalRepository(root_dir="/local/root")

assert local_repo.PROTOCOL == "file"
assert type(local_repo.filesystem) == fsspec.implementations.local.LocalFileSystem
assert isinstance(local_repo.filesystem, fsspec.implementations.local.LocalFileSystem)


@patch("fsspec.implementations.local.LocalFileSystem.open")
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/repository/test_memory_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def test_initialization():

assert memory_repo.PROTOCOL == "memory"
assert memory_repo.root_dir == "/root"
assert type(memory_repo.filesystem) == fsspec.implementations.memory.MemoryFileSystem
assert isinstance(memory_repo.filesystem, fsspec.implementations.memory.MemoryFileSystem)


def test_persist_dataframe():
Expand Down
3 changes: 1 addition & 2 deletions tests/unit/repository/test_s3_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
def test_initialization():
s3_repo = S3Repository(root_dir="s3://bucket/root")

assert s3_repo.PROTOCOL == "s3"
assert type(s3_repo.filesystem) == s3fs.core.S3FileSystem
assert isinstance(s3_repo.filesystem, s3fs.core.S3FileSystem)


@patch("s3fs.core.S3FileSystem.open")
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/sklearn/test_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def test_get_default_estimator_logger(project_client, fake_estimator_cls):

logger = pipeline.get_estimator_logger()

assert type(logger) == EstimatorLogger
assert isinstance(logger, EstimatorLogger)


def test_get_user_defined_estimator_logger(project_client, fake_estimator_cls):
Expand All @@ -29,7 +29,7 @@ def test_get_user_defined_estimator_logger(project_client, fake_estimator_cls):

logger = pipeline.get_estimator_logger("est")

assert type(logger) == FilterEstimatorLogger
assert isinstance(logger, FilterEstimatorLogger)


def test_fit_logs_parameters(project_client, fake_estimator_cls):
Expand Down
Loading