Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT: attempt to move to pyproject.toml #969

Merged
merged 7 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from 3 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
9 changes: 2 additions & 7 deletions .github/workflows/main_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade pytest pyflakes asv pytest-cov lxml matplotlib packaging humanize "mypy<1.0.0"
python -m pip install --upgrade pyflakes asv pytest-cov "mypy<1.0.0"
- if: ${{matrix.platform == 'macos-latest'}}
name: Install MacOS deps
run: |
Expand All @@ -53,12 +53,7 @@ jobs:
- name: Install pydarshan
run: |
cd darshan-util/pydarshan
python -m pip install .
# shim for importlib.resources on Python < 3.9
- if: ${{matrix.python-version < 3.9}}
name: Install importlib_resources
run: |
python -m pip install -U importlib_resources
python -m pip install .[test]
# only install the darshan_logs project in some CI
# entries so we test proper handling of skips
# in test suite
Expand Down
2 changes: 0 additions & 2 deletions darshan-util/pydarshan/RELEASE-CHECKLIST-PyDarshan.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ Notes on how to release a new version of PyDarshan
- Update CHANGELOG.rst
- commit
- Update version numbers in:
setup.py
pyproject.toml
setup.cfg
darshan/__init__.py
- Make sure documentation in docs/ is up to date
- commit
Expand Down
38 changes: 38 additions & 0 deletions darshan-util/pydarshan/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,44 @@ requires = [
name = "darshan"
requires-python = ">=3.7"
version = "3.4.4.0"
description = "Python tools to interact with Darshan log records of HPC applications."
readme = 'README.rst'
dependencies = [
"cffi",
"numpy",
"pandas",
"matplotlib",
"seaborn",
"mako",
"humanize"
]
classifiers = [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12"
]

[project.urls]
homepage = 'https://www.mcs.anl.gov/research/projects/darshan/'
repository = 'https://github.com/darshan-hpc/darshan'

[project.optional-dependencies]
test = [
"packaging",
"pytest",
"lxml",
"matplotlib",
"importlib_resources;python_version<'3.9'",
"humanize"
]

[tool.cibuildwheel]
environment = "PYDARSHAN_BUILD_EXT=1"
Expand Down
35 changes: 0 additions & 35 deletions darshan-util/pydarshan/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,6 @@
raise RuntimeError("Python version >= 3.7 required.")


with open("README.rst") as readme_file:
readme = readme_file.read()


requirements = ["cffi", "numpy", "pandas", "matplotlib", "seaborn", "mako", "humanize"]

setup_requirements = [
"pytest-runner",
]
test_requirements = ["pytest"]


# NOTE: The Python C extension is currently only used to automate
# the build process of binary wheels for distribution via PyPi.
Expand Down Expand Up @@ -54,33 +43,9 @@


setup(
author="",
author_email="",
classifiers=[
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
description="Python tools to interact with darshan log records of HPC applications.",
long_description=readme,
ext_modules=ext_modules,
install_requires=requirements,
include_package_data=True,
keywords="darshan",
name="darshan",
packages=find_packages(include=["darshan"]),
setup_requires=setup_requirements,
tests_require=test_requirements,
url='https://www.mcs.anl.gov/research/projects/darshan/',
version='3.4.4.0',
zip_safe=False,
package_data={"": ["*.darshan"],
"darshan": ["cli/style.css",
Expand Down
Loading