Skip to content

Commit fbef88e

Browse files
authored
Merge pull request #89 from Sparks29032/build_restructure
Refactor src and switch to pyproject.toml
2 parents c3f394a + a04ae59 commit fbef88e

Some content is hidden

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

78 files changed

+59
-77
lines changed

.coveragerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[run]
22
source =
3-
diffpy/pdfmorph/
3+
src/diffpy/pdfmorph/
44
[report]
55
omit =
66
*/python?.?/*

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
shell: bash -l {0}
5151
run: |
5252
conda activate test
53-
coverage run run_tests.py
53+
pdfmorph --help # Check run on command line
54+
python -m coverage run run_tests.py # use `python -m` to search for modules within env
5455
coverage report -m
5556
codecov

README.rst

Lines changed: 1 addition & 1 deletion

README.txt

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

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: regolith
1+
name: diffpy.pdfmorph
22
channels:
33
- conda-forge
44
dependencies:

pyproject.toml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
[build-system]
2+
requires = ["setuptools>=62.0", "setuptools-git-versioning<2"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
name = "diffpy.pdfmorph"
7+
dynamic=['version']
8+
authors = [
9+
{ name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" },
10+
]
11+
maintainers = [
12+
{ name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" },
13+
]
14+
description = "Tools for manipulating and comparing PDF profiles."
15+
keywords = ["diffpy PDF"]
16+
readme = "README.rst"
17+
requires-python = ">=3.10"
18+
classifiers = [
19+
'Development Status :: 4 - Beta',
20+
'Environment :: Console',
21+
'Intended Audience :: Science/Research',
22+
'License :: OSI Approved :: BSD License',
23+
'Operating System :: MacOS :: MacOS X',
24+
'Operating System :: Microsoft :: Windows',
25+
'Operating System :: POSIX',
26+
'Operating System :: Unix',
27+
'Programming Language :: Python :: 3.10',
28+
'Programming Language :: Python :: 3.11',
29+
'Programming Language :: Python :: 3.12',
30+
'Topic :: Scientific/Engineering :: Chemistry',
31+
'Topic :: Scientific/Engineering :: Physics',
32+
]
33+
34+
[project.scripts]
35+
pdfmorph = "diffpy.pdfmorph.pdfmorphapp:main"
36+
37+
[project.urls]
38+
Homepage = "https://github.com/diffpy/diffpy.pdfmorph/"
39+
Issues = "https://github.com/diffpy/diffpy.pdfmorph/issues"
40+
41+
[tool.pytest.ini_options]
42+
pythonpath = ["src"]
43+
44+
[tool.setuptools-git-versioning]
45+
enabled = true
46+
template = "{tag}"
47+
dev_template = "{tag}"
48+
dirty_template = "{tag}"
49+
50+
[tool.setuptools.packages.find]
51+
where = ["src"] # list of folders that contain the packages (["."] by default)
52+
include = ["diffpy*"] # package names should match these glob patterns (["*"] by default)
53+
exclude = ["diffpy.pdfmorph.tests*"] # exclude packages matching these glob patterns (empty by default)
54+
namespaces = false # to disable scanning PEP 420 namespaces (true by default)

setup.py

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

0 commit comments

Comments
 (0)