Skip to content

Commit c8ae6ce

Browse files
Merge branch 'main' into feature/list-estimation-procedure-ids-1750
2 parents 2e36857 + 0a44155 commit c8ae6ce

23 files changed

Lines changed: 152 additions & 110 deletions

‎.github/workflows/dist.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ on:
66
push:
77
branches:
88
- main
9-
- develop
109
tags:
1110
- "v*.*.*"
1211

1312
pull_request:
1413
branches:
1514
- main
16-
- develop
1715

1816
concurrency:
1917
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

‎.github/workflows/docs.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ on:
55
push:
66
branches:
77
- main
8-
- develop
98
tags:
109
- "v*.*.*"
1110

1211
pull_request:
1312
branches:
1413
- main
15-
- develop
1614

1715
concurrency:
1816
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -40,7 +38,7 @@ jobs:
4038
CI: false
4139
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4240
PAGES_BRANCH: gh-pages
43-
if: (contains(github.ref, 'develop') || contains(github.ref, 'main')) && github.event_name == 'push'
41+
if: contains(github.ref, 'main') && github.event_name == 'push'
4442
run: |
4543
git config user.name doc-bot
4644
git config user.email doc-bot@openml.com

‎.github/workflows/release_docker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- 'develop'
7+
- 'main'
88
- 'docker'
99
tags:
1010
- 'v*'

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ on:
77
push:
88
branches:
99
- main
10-
- develop
1110
tags:
1211
- "v*.*.*"
1312

1413
pull_request:
1514
branches:
1615
- main
17-
- develop
1816

1917
concurrency:
2018
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -100,7 +98,7 @@ jobs:
10098
if [[ "$major" -gt 1 ]] || { [[ "$major" -eq 1 ]] && [[ "$minor" -ge 7 ]]; }; then
10199
pip install "pandas==3.*"
102100
else
103-
pip install "pandas==2.*"
101+
pip install "pandas==2.*" "pyarrow<26"
104102
fi
105103
106104
- name: Store repository status
@@ -196,7 +194,10 @@ jobs:
196194
197195
- name: Cleanup Docker setup
198196
if: always() && steps.clone-services.outcome == 'success'
197+
working-directory: ./services
199198
run: |
199+
docker compose --profile rest-api --profile minio --profile evaluation-engine down -v
200+
cd ..
200201
sudo rm -rf services
201202
202203
- name: Check for files left behind by test

‎CITATION.cff‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
cff-version: 1.2.0
2-
message: "If you use this software in a publication, please cite the metadata from preferred-citation."
2+
title: "OpenML Python"
3+
message: "If you use this software in a publication, please cite the metadata from 'preferred-citation'."
4+
type: software
5+
license: "BSD-3-Clause"
6+
repository-code: "https://github.com/openml/openml-python"
7+
url: "https://openml.github.io/openml-python/"
8+
authors:
9+
- name: "OpenML-Python Contributors"
310
preferred-citation:
411
type: article
512
authors:

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ in the PR description.
153153
154154
The preferred workflow for contributing to openml-python is to
155155
fork the [main repository](https://github.com/openml/openml-python) on
156-
GitHub, clone, check out the branch `main`, and develop on a new branch
157-
branch. Steps:
156+
GitHub, clone, and develop on a new branch:
158157
159158
0. Make sure you have git installed, and a GitHub account.
160159
@@ -171,12 +170,6 @@ local disk:
171170
cd openml-python
172171
```
173172
174-
3. Switch to the ``develop`` branch:
175-
176-
```bash
177-
git checkout main
178-
```
179-
180173
3. Create a ``feature`` branch to hold your development changes:
181174
182175
```bash

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
[![Latest Release](https://img.shields.io/github/v/release/openml/openml-python)](https://github.com/openml/openml-python/releases)
1818
[![Python Versions](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue)](https://pypi.org/project/openml/)
1919
[![Downloads](https://static.pepy.tech/badge/openml)](https://pepy.tech/project/openml)
20+
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.PLACEHOLDER.svg)](https://doi.org/10.5281/zenodo.PLACEHOLDER)
2021
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
2122
<!-- Add green badges for CI and precommit -->
2223

‎docker/readme.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ docker run -v PATH/TO/FILE:/openml/MY_SCRIPT.py openml/openml-python MY_SCRIPT.p
4444
You can run the unit tests by passing `test` as the first argument.
4545
It also requires a local or remote repository to be specified, which is explained
4646
[below]((#using-local-or-remote-code). For this example, we specify to test the
47-
`develop` branch:
47+
`my-feature` branch:
4848

4949
```text
50-
docker run openml/openml-python test develop
50+
docker run openml/openml-python test my-feature
5151
```
5252

5353
### Building documentation
@@ -56,16 +56,16 @@ You can build the documentation by passing `doc` as the first argument,
5656
you should [mount]((https://docs.docker.com/storage/bind-mounts/#start-a-container-with-a-bind-mount))
5757
an output directory in which the docs will be stored. You also need to provide a remote
5858
or local repository as explained in [the section below]((#using-local-or-remote-code).
59-
In this example, we build documentation for the `develop` branch.
59+
In this example, we build documentation for the `my-feature` branch.
6060
On Windows:
6161

6262
```text
63-
docker run --mount type=bind,source="E:\\files/output",destination="/output" openml/openml-python doc develop
63+
docker run --mount type=bind,source="E:\\files/output",destination="/output" openml/openml-python doc my-feature
6464
```
6565

6666
on Linux:
6767
```text
68-
docker run --mount type=bind,source="./output",destination="/output" openml/openml-python doc develop
68+
docker run --mount type=bind,source="./output",destination="/output" openml/openml-python doc my-feature
6969
```
7070

7171
see [the section below]((#using-local-or-remote-code) for running against local changes

‎docs/details.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ This document highlights some of the more advanced features of
55

66
## Configuration
77

8-
The configuration file resides in a directory `.config/openml` in the
8+
The configuration file resides in a directory `~/.config/openml` in the
99
home directory of the user and is called config (More specifically, it
10-
resides in the [configuration directory specified by the XDGB Base
10+
resides in the [configuration directory specified by the XDG Base
1111
Directory
1212
Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html)).
1313
It consists of `key = value` pairs which are separated by newlines. The
1414
following keys are defined:
1515

1616
- apikey: required to access the server.
17-
- server: the server to connect to (default: `http://www.openml.org`).
18-
For connection to the test server, set this to `test.openml.org`.
17+
- server: the server to connect to (default: `https://www.openml.org`).
18+
For connection to the test server, set this to `https://test.openml.org`.
1919
- cachedir: the root folder where the cache file directories should be created.
2020
If not given, will default to `~/.openml/cache`
2121
- avoid_duplicate_runs: if set to `True` (default), when certain functions

‎docs/extensions.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ to upload it. However, in order to simplify the process of uploading
2727
flows and runs from a specific library, an additional interface can be
2828
built. The OpenML-Python team does not have the capacity to develop and
2929
maintain such interfaces on its own. For this reason, we have built an
30-
extension interface to allows others to contribute back. Building a
31-
suitable extension for therefore requires an understanding of the
30+
extension interface to allow others to contribute back. Building a
31+
suitable extension therefore requires an understanding of the
3232
current OpenML-Python support.
3333

3434
[This tutorial](../examples/Basics/simple_flows_and_runs_tutorial) shows how the scikit-learn
@@ -65,8 +65,8 @@ and can be implemented in several lines of code.
6565
Typically, the flow-dependency field is used to check whether
6666
the specific library is present, and no unknown libraries are
6767
present there.
68-
- `can_handle_model`: Similar as
69-
`can_handle_flow`:, except that in
68+
- `can_handle_model`: Similar to
69+
`can_handle_flow`, except that in
7070
this case a Python object is given. As such, in many cases, this
7171
method can be implemented by checking whether this adheres to a
7272
certain base class.
@@ -138,7 +138,7 @@ Each extension created should be a stand-alone repository, compatible
138138
with the [OpenML-Python repository](https://github.com/openml/openml-python).
139139
The extension repository should work off-the-shelf with *OpenML-Python* installed.
140140

141-
Create a public Github repo with the following directory structure:
141+
Create a public GitHub repo with the following directory structure:
142142

143143
| [repo name]
144144
| |-- [extension name]
@@ -149,7 +149,7 @@ Create a public Github repo with the following directory structure:
149149
### Recommended
150150

151151
- Test cases to keep the extension up to date with the
152-
Openml-Python upstream changes.
152+
OpenML-Python upstream changes.
153153
- Documentation of the extension API, especially if any new
154154
functionality added to OpenML-Python\'s extension design.
155155
- Examples to show how the new extension interfaces and works with

0 commit comments

Comments
 (0)