Skip to content

Commit

Permalink
Merge pull request #138 from mrava87/patch-setup
Browse files Browse the repository at this point in the history
build: switch from setup.py to pyproject.toml
  • Loading branch information
mrava87 authored Oct 3, 2023
2 parents c894e85 + 9b5e2a3 commit f7922db
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 50 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
platform: [ ubuntu-latest, macos-latest ]
python-version: ["3.8", "3.9", "3.10"]

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ sphinx:
python:
install:
- requirements: requirements-dev.txt
- method: setuptools
- method: pip
path: .
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dev-install_conda:

tests:
make pythoncheck
$(PYTHON) setup.py test
pytest

doc:
cd docs && rm -rf source/api/generated && rm -rf source/gallery &&\
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
displayName: 'Install prerequisites and library'
- script: |
python setup.py test
pytest
condition: succeededOrFailed()
displayName: 'Run tests'
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
displayName: 'Install prerequisites and library'
- script: |
python setup.py test
pytest
condition: succeededOrFailed()
displayName: 'Run tests'
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
52 changes: 51 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,56 @@
[metadata]
name = pyproximal
fullname = PyProximal
description = Python library implementing proximal operators to solve non-smooth, constrained convex problems with proximal algorithms
long_description = file: README.md
long_description_content_type = text/markdown
author = The PyLops Development Team
author_email = matteoravasi@gmail.com
maintainer = "Matteo Ravasi"
maintainer_email = matteoravasi@gmail.com
license = LGPL-3.0 License
license_file = LICENSE.md
platform = any
keywords = algebra, inverse problems, proximal, convex optimization, large-scale optimization
classifiers =
Development Status :: 5 - Production/Stable
Intended Audience :: Developers
Intended Audience :: Science/Research
Intended Audience :: Education
License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3),
Natural Language :: English
Operating System :: OS Independent
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Topic :: Scientific/Engineering : Mathematics
url = https://github.com/pylops/pyproximal

project_urls =
Documentation = https://pyproximal.readthedocs.io/
Release Notes = https://github.com/pylops/pyproximal/releases
Bug Tracker = https://github.com/pylops/pyproximal/issues
Source Code = https://github.com/pylops/pyproximal

[options]
zip_safe = True
include_package_data = True
packages = find:
python_requires = >=3.8
install_requires =
numpy >= 1.15.0
scipy >= 1.8.0
pylops >= 2.0.0

[options.extras_require]
advanced =
llvmlite
numba

[aliases]
test=pytest

[tool:pytest]
addopts = --verbose
python_files = pytests/*.py
python_files = pytests/*.py
42 changes: 0 additions & 42 deletions setup.py

This file was deleted.

0 comments on commit f7922db

Please sign in to comment.