Skip to content

Commit b5080c0

Browse files
authored
Merge pull request #5 from zmx27/change-package-structure
chore: embed DistancePrinter under src/diffpy
2 parents 0c17ba2 + e629505 commit b5080c0

File tree

6 files changed

+18
-3
lines changed

6 files changed

+18
-3
lines changed

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ classifiers = [
3333
]
3434

3535
[project.scripts]
36-
distanceprinter = 'DistancePrinter.distanceprinter:main'
36+
distanceprinter = 'diffpy.distanceprinter.distanceprinter:main'
3737

3838
[project.urls]
3939
Homepage = "https://github.com/diffpy/diffpy.distanceprinter/"
@@ -46,7 +46,7 @@ dev_template = "{tag}"
4646
dirty_template = "{tag}"
4747

4848
[tool.setuptools.packages.find]
49-
where = ["DistancePrinter"] # list of folders that contain the packages (["."] by default)
49+
where = ["src"] # list of folders that contain the packages (["."] by default)
5050
include = ["*"] # package names should match these glob patterns (["*"] by default)
5151
exclude = [] # exclude packages matching these glob patterns (empty by default)
5252
namespaces = false # to disable scanning PEP 420 namespaces (true by default)

src/diffpy/__init__.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env python
2+
##############################################################################
3+
#
4+
# DistancePrinter by Simon J. L. Billinge group
5+
# (c) 2013 Trustees of the Columbia University
6+
# in the City of New York. All rights reserved.
7+
#
8+
# File coded by: Xiaohao Yang
9+
#
10+
# See AUTHORS.txt for a list of people who contributed.
11+
# See LICENSENOTICE.txt for license information.
12+
#
13+
##############################################################################
14+
15+
# Placeholder until this gets scikit-packaged later
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/test_distanceprinter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
from io import open
33

4-
from DistancePrinter.distanceprinter import main
4+
from diffpy.distanceprinter.distanceprinter import main
55

66

77
def test_distanceprinter(monkeypatch):

0 commit comments

Comments
 (0)