Skip to content

Commit cb01a77

Browse files
glemaitreglemaitre
committed
Merge remote-tracking branch 'origin/master' into pr/DavidRosen/868
2 parents 43c9be7 + 79394a3 commit cb01a77

File tree

85 files changed

+1901
-790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1901
-790
lines changed

‎.circleci/config.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
version: 2
22

33
jobs:
4-
python3:
4+
doc:
55
docker:
6-
- image: circleci/python:3.6.1
6+
- image: circleci/python:3.7.7-buster
77
environment:
88
- USERNAME: "glemaitre"
99
- ORGANIZATION: "imbalanced-learn"
@@ -12,7 +12,18 @@ jobs:
1212
- EMAIL: "g.lemaitre58@gmail.com"
1313
- MINICONDA_PATH: ~/miniconda
1414
- CONDA_ENV_NAME: testenv
15+
- OMP_NUM_THREADS: 1
1516
- PYTHON_VERSION: 3
17+
- NUMPY_VERSION: 'latest'
18+
- SCIPY_VERSION: 'latest'
19+
- SKLEARN_VERSION: 'latest'
20+
- MATPLOTLIB_VERSION: 'latest'
21+
- SPHINX_VERSION: 'min'
22+
- PANDAS_VERSION: 'latest'
23+
- SPHINX_GALLERY_VERSION: 'latest'
24+
- NUMPYDOC_VERSION: 'latest'
25+
- SPHINXCONTRIB_BIBTEX_VERSION: 'latest'
26+
- PYDATA_SPHINX_THEME_VERSION: 'latest'
1627
steps:
1728
- add_ssh_keys:
1829
fingerprints:
@@ -44,4 +55,4 @@ workflows:
4455
version: 2
4556
build-doc-and-deploy:
4657
jobs:
47-
- python3
58+
- doc

‎.github/workflows/circleci-artifacts-redirector.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: circleci-artifacts-redirector
2+
3+
on: [status]
4+
jobs:
5+
circleci_artifacts_redirector_job:
6+
runs-on: ubuntu-latest
7+
name: Run CircleCI artifacts redirector
8+
steps:
9+
- name: GitHub Action step
10+
uses: larsoner/circleci-artifacts-redirector-action@master
11+
with:
12+
repo-token: ${{ secrets.GITHUB_TOKEN }}
13+
artifact-path: doc/index.html
14+
circleci-jobs: documentation

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ doc/auto_examples/
123123
doc/generated/
124124
doc/references/generated/
125125
doc/bibtex/auto
126+
doc/min_dependency_table.rst
126127

127128
# MacOS
128129
.DS_Store

‎.pre-commit-config.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@ repos:
1414
hooks:
1515
- id: flake8
1616
types: [file, python]
17+
- repo: https://github.com/pre-commit/mirrors-mypy
18+
rev: v0.782
19+
hooks:
20+
- id: mypy
21+
files: sklearn/
22+
additional_dependencies: [pytest==6.2.4]

‎.travis.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎MANIFEST.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
recursive-include doc *
33
recursive-include examples *
44
include AUTHORS.rst
5-
include CONTRIBUTING.ms
5+
include CONTRIBUTING.md
66
include LICENSE
7-
include README.rst
7+
include README.rst

‎README.rst

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@
44

55
.. _scikit-learn-contrib: https://github.com/scikit-learn-contrib
66

7-
|Azure|_ |Travis|_ |Codecov|_ |CircleCI|_ |PythonVersion|_ |Pypi|_ |Gitter|_ |Black|_
7+
|Azure|_ |Codecov|_ |CircleCI|_ |PythonVersion|_ |Pypi|_ |Gitter|_ |Black|_
88

99
.. |Azure| image:: https://dev.azure.com/imbalanced-learn/imbalanced-learn/_apis/build/status/scikit-learn-contrib.imbalanced-learn?branchName=master
10-
.. _Azure: https://dev.azure.com/imbalanced-learn/imbalanced-learn/_build
11-
12-
.. |Travis| image:: https://travis-ci.org/scikit-learn-contrib/imbalanced-learn.svg?branch=master
13-
.. _Travis: https://travis-ci.org/scikit-learn-contrib/imbalanced-learn
10+
.. _Azure: https://dev.azure.com/imbalanced-learn/imbal
1411

1512
.. |Codecov| image:: https://codecov.io/gh/scikit-learn-contrib/imbalanced-learn/branch/master/graph/badge.svg
1613
.. _Codecov: https://codecov.io/gh/scikit-learn-contrib/imbalanced-learn
@@ -30,7 +27,16 @@
3027
.. |Black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
3128
.. _Black: :target: https://github.com/psf/black
3229

33-
30+
.. |PythonMinVersion| replace:: 3.7
31+
.. |NumPyMinVersion| replace:: 1.14.6
32+
.. |SciPyMinVersion| replace:: 1.1.0
33+
.. |ScikitLearnMinVersion| replace:: 0.24.2
34+
.. |MatplotlibMinVersion| replace:: 2.2.3
35+
.. |PandasMinVersion| replace:: 0.25.0
36+
.. |TensorflowMinVersion| replace:: 2.4.3
37+
.. |KerasMinVersion| replace:: 2.4.3
38+
.. |SeabornMinVersion| replace:: 0.9.0
39+
.. |PytestMinVersion| replace:: 5.0.1
3440

3541
imbalanced-learn
3642
================
@@ -54,18 +60,23 @@ Installation
5460
Dependencies
5561
~~~~~~~~~~~~
5662

57-
imbalanced-learn is tested to work under Python 3.6+.
58-
The dependency requirements are based on the last scikit-learn release:
63+
`imbalanced-learn` requires the following dependencies:
64+
65+
- Python (>= |PythonMinVersion|)
66+
- NumPy (>= |NumPyMinVersion|)
67+
- SciPy (>= |SciPyMinVersion|)
68+
- Scikit-learn (>= |ScikitLearnMinVersion|)
69+
70+
Additionally, `imbalanced-learn` requires the following optional dependencies:
71+
72+
- Pandas (>= |PandasMinVersion|) for dealing with dataframes
73+
- Tensorflow (>= |TensorflowMinVersion|) for dealing with TensorFlow models
74+
- Keras (>= |KerasMinVersion|) for dealing with Keras models
5975

60-
* scipy(>=0.19.1)
61-
* numpy(>=1.13.3)
62-
* scikit-learn(>=0.24)
63-
* joblib(>=0.11)
64-
* keras 2 (optional)
65-
* tensorflow (optional)
76+
The examples will requires the following additional dependencies:
6677

67-
Additionally, to run the examples, you need matplotlib(>=2.0.0) and
68-
pandas(>=0.22).
78+
- Matplotlib (>= |MatplotlibMinVersion|)
79+
- Seaborn (>= |SeabornMinVersion|)
6980

7081
Installation
7182
~~~~~~~~~~~~

0 commit comments

Comments
 (0)