Skip to content
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
name: Get Python running
command: |
python -m pip install --user --upgrade --progress-bar off pip
python -m pip install --user --upgrade --progress-bar off -r doc/doc-requirements.txt
python -m pip install --user -e .
python -m pip install --user .[doc]

- save_cache:
key: pip-cache
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ jobs:
uses: actions/setup-python@v3
with:
python-version: 3.8
- name: Install dependencies
- name: Install package and testing tools
run: |
python -m pip install --upgrade pip
pip install celer
pip install pytest
pip install numpydoc
pip install .
pip install .[test]
- name: Install other dependencies
run: |
pip install celer
pip install statsmodels cvxopt
pip install git+https://github.com/jolars/pyslope.git
# for testing Cox estimator
Expand Down
12 changes: 7 additions & 5 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,18 @@
import os
import sys
import warnings
# import os

import sphinx_gallery # noqa
import sphinx_bootstrap_theme
import sphinx_bootstrap_theme # noqa
from numpydoc import numpydoc, docscrape # noqa
from doc.github_link import make_linkcode_resolve

from skglm import __version__ as version

curdir = os.path.dirname(__file__)
sys.path.append(os.path.abspath(os.path.join(curdir, 'sphinxext')))
# include custom extension
curdir = os.path.dirname(__file__) # noqa
sys.path.append(os.path.abspath(os.path.join(curdir, 'sphinxext'))) # noqa

from github_link import make_linkcode_resolve


# Mathurin: disable agg warnings in doc
Expand Down
4 changes: 2 additions & 2 deletions doc/contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Your contribution is welcome and highly valuable. It can be
You can use the `the issue section <https://github.com/scikit-learn-contrib/skglm/issues>`_ to make suggestions.

**pull request**
you may have fixed a bug, added a feature, or even fixed a small typo in the documentation, ...
you may have fixed a bug, added a feature, or even fixed a small typo in the documentation, ...
You can submit a `pull request <https://github.com/scikit-learn-contrib/skglm/pulls>`_
to integrate your changes and we will reach out to you shortly.

Expand Down Expand Up @@ -56,5 +56,5 @@ contribute with code or documentation.
.. code-block:: shell

$ cd doc
$ pip install -r doc-requirements.txt
$ pip install .[doc]
$ make html
12 changes: 0 additions & 12 deletions doc/doc-requirements.txt

This file was deleted.

File renamed without changes.
56 changes: 56 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "skglm"
description = "A fast and modular scikit-learn replacement for generalized linear models"
authors = [
{name = "Mathurin Massias", email = "mathurin.massias@gmail.com"},
{name = "Badr Moufad", email = "badr.moufad@emines.um6p.ma"},
{name = "Pierre-Antoine Bannier", email = "pierreantoine.bannier@gmail.com"},
{name = "Quentin Bertrand", email = "quentin.bertrand@mila.quebec"},
{name = "Quentin Klopfenstein", email = "quentin.klopfenstein@uni.lu"}
]
license = {text = "BSD (3-Clause)"}
readme = {file = "README.md", content-type = "text/markdown"}
dependencies = [
"numpy>=1.12",
"numba",
"scikit-learn>=1.0",
"scipy>=0.18.0",
]
dynamic = ["version"]


[tool.setuptools.dynamic]
version = {attr = "skglm.__version__"}


[project.urls]
Homepage = "https://contrib.scikit-learn.org/skglm"
Source = "https://github.com/scikit-learn-contrib/skglm.git"


[project.optional-dependencies]
test = [
"pytest",
"flake8",
"coverage",
"numpydoc",
]

doc = [
"benchopt",
"libsvmdata>=0.2",
"matplotlib>=2.0.0",
"myst_parser",
"numpydoc",
"pillow",
"sphinx-bootstrap-theme",
"sphinx_copybutton",
"sphinx-gallery",
"pytest",
"furo",
"lifelines",
]
37 changes: 0 additions & 37 deletions setup.py

This file was deleted.