Skip to content

Commit fd04b23

Browse files
paquiteauchaithyagr
authored andcommitted
update to src layout and cleanup dependencies. (#176)
* update to src layout and cleanup dependencies. * fix toml file.
1 parent 4e2489e commit fd04b23

Some content is hidden

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

62 files changed

+91
-85
lines changed

.github/workflows/ci-build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
run: |
3636
conda info
3737
conda list
38-
sudo apt install -y libnfft3-dev
3938
python --version
4039
4140
- name: Install Dependencies
@@ -48,7 +47,6 @@ jobs:
4847
python -m pip install git+https://github.com/CEA-COSMIC/pysap.git@develop
4948
python -m pip install git+https://github.com/AGrigis/pysphinxdoc.git
5049
python -m pip install coverage nose pytest pytest-cov pycodestyle pydocstyle twine pytest-xdist
51-
python -m pip install pynfft2
5250
python -m pip install --upgrade .
5351
5452
- name: Check PEP
@@ -63,7 +61,7 @@ jobs:
6361
shell: bash -l {0}
6462
run: |
6563
which python
66-
python setup.py test
64+
pytest
6765
6866
- name: Save Test Results
6967
if: always()

AUTHOR

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

MANIFEST.in

Lines changed: 0 additions & 1 deletion
This file was deleted.

gpu_requirements.txt

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

pyproject.toml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
2+
[project]
3+
name = "pysap-mri"
4+
version = "0.5.0"
5+
description = "Python Sparse data Analysis Package external MRI plugin."
6+
readme = "README.rst"
7+
authors = [
8+
{name = "Chaithya G R",email="chaithya.giliyarradhakrishna@cea.fr"},
9+
{name="Pierre-Antoine Comby", email="pierre-antoine.comby@cea.fr"},
10+
{name="Jean-Luc Starck", email="jl.stark@cea.fr"},
11+
{name="Philippe Ciuciu", email="philippe.ciuciu@cea.fr"},
12+
]
13+
dependencies = [
14+
"finufft>=2.2.0",
15+
"joblib>=1.0.0",
16+
"modopt>=1.7.1",
17+
"numpy>=1.16.0",
18+
"mri-nufft>=0.4.0",
19+
"progressbar2>=3.34.3",
20+
"scikit-image>=0.17.0",
21+
"scikit-learn>=0.19.1",
22+
"scipy>=1.3.0",
23+
]
24+
license = {text = "CeCILL-B"}
25+
requires-python = ">=3.10"
26+
27+
[project.optional-dependencies]
28+
test=['pytest>=5.0.1', 'pytest-cov>=2.7.1', 'pytest-pep8', 'pytest-runner', "pytest-xdist", "pytest-sugar"]
29+
gpu=["cupy", "cufinufft", "gpunufft"]
30+
31+
[project.urls]
32+
Homepage = "https://github.com/CEA-COSMIC/pysap-mri"
33+
34+
[build-system]
35+
requires = ["setuptools", "setuptools-scm[toml]", "wheel"]
36+
37+
[tool.setuptools_scm]
38+
write_to = "src/mri/_version.py"
39+
version_scheme = "python-simplified-semver"
40+
local_scheme="no-local-version"
41+
fallback_version="v99-dev"
42+
43+
44+
[tool.pytest.ini_options]
45+
addopts = ["-n 3",
46+
"--verbose",
47+
"--cov=mri",
48+
"--cov-config=.coveragerc",
49+
"--ignore-glob='*test_local*.py'",
50+
"--cov-report=term",
51+
"--cov-report=xml",
52+
"--junitxml=pytest.xml",
53+
"--maxfail=2",
54+
]
55+
testpaths = ["tests"]
56+
57+
[tool.pylsp-mypy]
58+
enabled = false
59+
live_mode = false
60+
61+
[tool.mypy]
62+
ignore_missing_imports = true
63+
64+
65+
[tool.coverage.run]
66+
omit = ["*tests*", "*__init__*", "*setup.py*", "*_version.py*", "*example*"]
67+
relative_files = true
68+
source = ["src"]
69+
70+
[tool.coverage.report]
71+
precision = 2
72+
exclude_lines = ["pragma: no cover", "raise NotImplementedError"]
73+
74+
# Formatting using black.
75+
[tool.black]
76+
77+
#linting using ruff
78+
[tool.ruff]
79+
extend-exclude = [ "example_*.py" , "*_version.py"]
80+
81+
[tool.ruff.lint]
82+
select = ["E", "F", "B", "Q", "UP", "D"]
83+
84+
ignore = [
85+
"B905", # zip() without an explicit strict= parameter
86+
"B028", # No explicit stacklevel keyword argument found
87+
"F401", # Using ``try: import ... except:`` is nice.
88+
]
89+
[tool.ruff.lint.pydocstyle]
90+
convention="numpy"

setup.cfg

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

setup.py

Lines changed: 0 additions & 55 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)