Skip to content
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
download:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: 'Download artifact'
uses: actions/github-script@v6
uses: actions/github-script@v8
with:
script: |
let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v4
- uses: actions/checkout@v3
- uses: actions/setup-python@v6
- uses: actions/checkout@v5
with:
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
- name: Install package
run: pip3 install --upgrade-strategy eager -v ".[all]"
- name: Build and Commit
uses: sphinx-notes/pages@v2
uses: sphinx-notes/pages@v3
- name: Push changes
uses: ad-m/github-push-action@master
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: '3.x'
- name: Install dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest]
python-version: ['3.10', '3.11', '3.12']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -25,7 +25,7 @@ jobs:
coverage run --source=skdatasets/ -m pytest;
coverage xml -o coverage.xml # explicitely exporting coverage file to be read by coverage report command.
- name: Archive code coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: code-coverage-report
path: coverage.xml
20 changes: 0 additions & 20 deletions docs/utils.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,6 @@ scikit-learn API.

~skdatasets.utils.estimator.json2estimator

Experiment
----------

The following functions can be used to execute several experiments,
such as classification or regression tasks, with different datasets
for a posterior comparison.
These experiments are created using the Sacred library, storing the
most common parameters of interest, such as time required for training or
final scores.
After the experiments have finished, the final scores can be easily
retrieved in order to plot a table or perform hypothesis testing.

.. autosummary::
:toctree: autosummary

~skdatasets.utils.experiment.create_experiments
~skdatasets.utils.experiment.run_experiments
~skdatasets.utils.experiment.fetch_scores
~skdatasets.utils.experiment.ScoresInfo

Scores
------

Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@ dependencies = ["numpy", "scipy", "scikit-learn"]
cran = ["packaging", "rdata"]
forex = ["forex_python>=1.6"]
keel = ["pandas"]
keras = ["tensorflow"]
keras = ["keras", "tensorflow"]
physionet = ["pandas", "wfdb"]
utils-estimator = ["jsonpickle"]
utils-experiments = ["sacred", "incense"]
utils-scores = ["statsmodels", "jinja2"]
all = ["scikit-datasets[cran, forex, keel, keras, physionet, utils-estimator, utils-experiments, utils-scores]"]
all = ["scikit-datasets[cran, forex, keel, keras, physionet, utils-estimator, utils-scores]"]
test = ["pytest", "pytest-cov[all]", "coverage", "scikit-datasets[all]"]
[project.urls]
homepage = "https://github.com/daviddiazvico/scikit-datasets"
Expand Down
2 changes: 1 addition & 1 deletion skdatasets/repositories/keras.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import numpy as np
from sklearn.utils import Bunch

from tensorflow.keras.datasets import (
from keras.datasets import (
boston_housing,
cifar10,
cifar100,
Expand Down
4 changes: 4 additions & 0 deletions skdatasets/tests/repositories/test_forex.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
"""

from datetime import date
import pytest

from skdatasets.repositories.forex import fetch


@pytest.mark.skip(reason="Max retries exceeded with url.")
def test_forex_usd_eur():
"""Tests forex USD-EUR dataset."""
data = fetch(
Expand All @@ -21,6 +23,7 @@ def test_forex_usd_eur():
assert data.data.shape == (31, 1)


@pytest.mark.skip(reason="Max retries exceeded with url.")
def test_forex_usd_eur_return_X_y():
"""Tests forex USD-EUR dataset."""
X, y = fetch(
Expand All @@ -34,6 +37,7 @@ def test_forex_usd_eur_return_X_y():
assert y is None


@pytest.mark.skip(reason="Max retries exceeded with url.")
def test_forex_btc_eur():
"""Tests forex BTC-EUR dataset."""
data = fetch(
Expand Down
40 changes: 0 additions & 40 deletions skdatasets/tests/utils/run.py

This file was deleted.

Loading
Loading