Skip to content

Commit 1301409

Browse files
authored
Merge pull request #16 from sbillinge/ci
adding __init__ to diffpy to get package structure correct
2 parents f3d29d9 + 842c122 commit 1301409

File tree

7 files changed

+34
-8
lines changed

7 files changed

+34
-8
lines changed

.coveragerc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[run]
22
source =
3-
labpdfproc
3+
src
4+
45
[report]
56
omit =
67
*/python?.?/*

.github/workflows/testing.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ jobs:
3939
- name: install diffpy.labpdfproc requirements
4040
shell: bash -l {0}
4141
run: |
42-
pwd
43-
ls
4442
conda config --set always_yes yes --set changeps1 no
4543
conda config --add channels conda-forge
4644
conda activate test
@@ -51,6 +49,8 @@ jobs:
5149
- name: Validate diffpy.labpdfproc
5250
shell: bash -l {0}
5351
run: |
52+
pwd
53+
ls
5454
conda activate test
5555
coverage run -m pytest -s
5656
coverage report -m

src/diffpy/__init__.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env python
2+
##############################################################################
3+
#
4+
# diffpy by DANSE Diffraction group
5+
# Simon J. L. Billinge
6+
# (c) 2010 The Trustees of Columbia University
7+
# in the City of New York. All rights reserved.
8+
#
9+
# File coded by: Pavol Juhas
10+
#
11+
# See AUTHORS.txt for a list of people who contributed.
12+
# See LICENSE_DANSE.txt for license information.
13+
#
14+
##############################################################################
15+
16+
"""diffpy - tools for structure analysis by diffraction.
17+
18+
Blank namespace package.
19+
"""
20+
21+
22+
from pkgutil import extend_path
23+
24+
__path__ = extend_path(__path__, __name__)
25+
26+
# End of file

src/diffpy/labpdfproc/functions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import math
22

33
import numpy as np
4+
45
from diffpy.utils.scattering_objects.diffraction_objects import Diffraction_object
56

67
RADIUS_MM = 1

src/diffpy/labpdfproc/labpdfprocapp.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
from argparse import ArgumentParser
33
from pathlib import Path
44

5+
from diffpy.labpdfproc.functions import apply_corr, compute_cve
56
from diffpy.utils.parsers.loaddata import loadData
67
from diffpy.utils.scattering_objects.diffraction_objects import XQUANTITIES, Diffraction_object
78

8-
from diffpy.labpdfproc.functions import apply_corr, compute_cve
9-
109
WAVELENGTHS = {"Mo": 0.71, "Ag": 0.59, "Cu": 1.54}
1110
known_sources = [key for key in WAVELENGTHS.keys()]
1211

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
def test_example():
2+
assert True

src/diffpy/labpdfproc/tests/test_examples.py

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

0 commit comments

Comments
 (0)