Skip to content

Commit

Permalink
Merge pull request #89 from Sparks29032/build_restructure
Browse files Browse the repository at this point in the history
Refactor src and switch to pyproject.toml
  • Loading branch information
sbillinge authored May 4, 2024
2 parents c3f394a + a04ae59 commit fbef88e
Show file tree
Hide file tree
Showing 78 changed files with 59 additions and 77 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[run]
source =
diffpy/pdfmorph/
src/diffpy/pdfmorph/
[report]
omit =
*/python?.?/*
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
shell: bash -l {0}
run: |
conda activate test
coverage run run_tests.py
pdfmorph --help # Check run on command line
python -m coverage run run_tests.py # use `python -m` to search for modules within env
coverage report -m
codecov
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Feel free to fork the project and contribute! To install PDFmorph
in a development mode where the source files are used directly
rather than copied to a system directory, use ::

python setup.py develop --user
python -m pip install -e .


CONTACTS
Expand Down
7 changes: 0 additions & 7 deletions README.txt

This file was deleted.

2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: regolith
name: diffpy.pdfmorph
channels:
- conda-forge
dependencies:
Expand Down
54 changes: 54 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
[build-system]
requires = ["setuptools>=62.0", "setuptools-git-versioning<2"]
build-backend = "setuptools.build_meta"

[project]
name = "diffpy.pdfmorph"
dynamic=['version']
authors = [
{ name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" },
]
maintainers = [
{ name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" },
]
description = "Tools for manipulating and comparing PDF profiles."
keywords = ["diffpy PDF"]
readme = "README.rst"
requires-python = ">=3.10"
classifiers = [
'Development Status :: 4 - Beta',
'Environment :: Console',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'Operating System :: MacOS :: MacOS X',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX',
'Operating System :: Unix',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Topic :: Scientific/Engineering :: Chemistry',
'Topic :: Scientific/Engineering :: Physics',
]

[project.scripts]
pdfmorph = "diffpy.pdfmorph.pdfmorphapp:main"

[project.urls]
Homepage = "https://github.com/diffpy/diffpy.pdfmorph/"
Issues = "https://github.com/diffpy/diffpy.pdfmorph/issues"

[tool.pytest.ini_options]
pythonpath = ["src"]

[tool.setuptools-git-versioning]
enabled = true
template = "{tag}"
dev_template = "{tag}"
dirty_template = "{tag}"

[tool.setuptools.packages.find]
where = ["src"] # list of folders that contain the packages (["."] by default)
include = ["diffpy*"] # package names should match these glob patterns (["*"] by default)
exclude = ["diffpy.pdfmorph.tests*"] # exclude packages matching these glob patterns (empty by default)
namespaces = false # to disable scanning PEP 420 namespaces (true by default)
66 changes: 0 additions & 66 deletions setup.py

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.
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 comments on commit fbef88e

Please sign in to comment.