PyPowder 0.0.0a6__tar.gz → 1.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- pypowder-1.0/.github/workflows/python-app.yml +39 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/.github/workflows/python-publish.yml +23 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/PKG-INFO +7 -3
- {pypowder-0.0.0a6 → pypowder-1.0}/README.md +4 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/pyproject.toml +7 -7
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPOW/__main__.py +3 -3
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPOW/__version__.py +3 -3
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPowder.egg-info/PKG-INFO +7 -3
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPowder.egg-info/SOURCES.txt +4 -3
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPowder.egg-info/scm_file_list.json +10 -9
- pypowder-1.0/src/PyPowder.egg-info/scm_version.json +8 -0
- pypowder-1.0/tests/ASG1_1.csv +5000 -0
- pypowder-1.0/tests/ASG1_1.xy +5001 -0
- pypowder-1.0/tests/test___main__.py +25 -0
- pypowder-1.0/tests/test_import_module.py +139 -0
- pypowder-0.0.0a6/src/PyPowder.egg-info/scm_version.json +0 -8
- pypowder-0.0.0a6/tests/ASG1_1.csv +0 -5000
- pypowder-0.0.0a6/tests/ASG1_1.gsas +0 -502
- pypowder-0.0.0a6/tests/ASG1_1.xy +0 -4999
- pypowder-0.0.0a6/tests/lab.py +0 -113
- {pypowder-0.0.0a6 → pypowder-1.0}/.gitattributes +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/.gitignore +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/LICENCE +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/RunConversion.bat +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/setup.cfg +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPOW/__init__.py +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPOW/import_module.py +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPowder.egg-info/dependency_links.txt +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPowder.egg-info/entry_points.txt +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPowder.egg-info/requires.txt +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/src/PyPowder.egg-info/top_level.txt +0 -0
- {pypowder-0.0.0a6 → pypowder-1.0}/tests/ASG1_1.XRDML +0 -0
- {pypowder-0.0.0a6/tests → pypowder-1.0}/working_example.py +0 -0
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
# This workflow will install Python dependencies, run tests and lint with a single version of Python
|
|
2
|
+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
|
|
3
|
+
|
|
4
|
+
name: Python application
|
|
5
|
+
|
|
6
|
+
on:
|
|
7
|
+
push:
|
|
8
|
+
branches: [ "main", "qol" ]
|
|
9
|
+
pull_request:
|
|
10
|
+
branches: [ "qol" ]
|
|
11
|
+
|
|
12
|
+
permissions:
|
|
13
|
+
contents: read
|
|
14
|
+
|
|
15
|
+
jobs:
|
|
16
|
+
build:
|
|
17
|
+
|
|
18
|
+
runs-on: ubuntu-latest
|
|
19
|
+
|
|
20
|
+
steps:
|
|
21
|
+
- uses: actions/checkout@v4
|
|
22
|
+
- name: Set up Python 3.9
|
|
23
|
+
uses: actions/setup-python@v3
|
|
24
|
+
with:
|
|
25
|
+
python-version: "3.9"
|
|
26
|
+
- name: Install dependencies
|
|
27
|
+
run: |
|
|
28
|
+
python -m pip install --upgrade pip
|
|
29
|
+
pip install flake8 pytest
|
|
30
|
+
pip install .
|
|
31
|
+
- name: Lint with flake8
|
|
32
|
+
run: |
|
|
33
|
+
# stop the build if there are Python syntax errors or undefined names
|
|
34
|
+
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
|
|
35
|
+
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
|
|
36
|
+
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
|
|
37
|
+
- name: Test with pytest
|
|
38
|
+
run: |
|
|
39
|
+
pytest
|
|
@@ -16,8 +16,30 @@ permissions:
|
|
|
16
16
|
contents: read
|
|
17
17
|
|
|
18
18
|
jobs:
|
|
19
|
+
test:
|
|
20
|
+
runs-on: ubuntu-latest
|
|
21
|
+
steps:
|
|
22
|
+
- uses: actions/checkout@v4
|
|
23
|
+
|
|
24
|
+
- uses: actions/setup-python@v5
|
|
25
|
+
with:
|
|
26
|
+
python-version: "3.9"
|
|
27
|
+
|
|
28
|
+
- name: Install dependencies
|
|
29
|
+
run: |
|
|
30
|
+
python -m pip install --upgrade pip
|
|
31
|
+
pip install pytest
|
|
32
|
+
# NOTE: Adjust the following line to install your package and its test dependencies.
|
|
33
|
+
# For example, if you use a requirements file: pip install -r requirements.txt
|
|
34
|
+
pip install .
|
|
35
|
+
|
|
36
|
+
- name: Test with pytest
|
|
37
|
+
run: |
|
|
38
|
+
pytest
|
|
39
|
+
|
|
19
40
|
release-build:
|
|
20
41
|
runs-on: ubuntu-latest
|
|
42
|
+
needs: test
|
|
21
43
|
|
|
22
44
|
steps:
|
|
23
45
|
- uses: actions/checkout@v4
|
|
@@ -68,3 +90,4 @@ jobs:
|
|
|
68
90
|
uses: pypa/gh-action-pypi-publish@release/v1
|
|
69
91
|
with:
|
|
70
92
|
packages-dir: dist/
|
|
93
|
+
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: PyPowder
|
|
3
|
-
Version:
|
|
3
|
+
Version: 1.0
|
|
4
4
|
Summary: Attempt at constructing a set of tools to convert XRDML files to a more usable format.
|
|
5
5
|
Author: Diogo Almeida, Max Pelly
|
|
6
6
|
Maintainer-email: Diogo Almeida <dafda1@st-andrews.ac.uk>
|
|
7
7
|
License-Expression: GPL-3.0-or-later
|
|
8
|
-
Project-URL: Homepage, https://github.com/
|
|
9
|
-
Project-URL: Issues, https://github.com/
|
|
8
|
+
Project-URL: Homepage, https://github.com/dafda1/PyPOW
|
|
9
|
+
Project-URL: Issues, https://github.com/dafda1/PyPOW/issues
|
|
10
10
|
Classifier: Programming Language :: Python :: 3
|
|
11
11
|
Classifier: Operating System :: OS Independent
|
|
12
12
|
Requires-Python: >=3.9
|
|
@@ -21,3 +21,7 @@ Dynamic: license-file
|
|
|
21
21
|
Attempt at constructing a set of tools to convert XRDML files to a more usable format,
|
|
22
22
|
developed for *_1.XRDML files as generated by PANanalytical Empyrian Cu-Kalpha diffractometers
|
|
23
23
|
JOHN and PAUL at the University of St Andrews.
|
|
24
|
+
|
|
25
|
+
## Contributions
|
|
26
|
+
Thanks to Max Pelly for
|
|
27
|
+
- restructuring files for deployment (ongoing with conda-forge)
|
|
@@ -2,3 +2,7 @@
|
|
|
2
2
|
Attempt at constructing a set of tools to convert XRDML files to a more usable format,
|
|
3
3
|
developed for *_1.XRDML files as generated by PANanalytical Empyrian Cu-Kalpha diffractometers
|
|
4
4
|
JOHN and PAUL at the University of St Andrews.
|
|
5
|
+
|
|
6
|
+
## Contributions
|
|
7
|
+
Thanks to Max Pelly for
|
|
8
|
+
- restructuring files for deployment (ongoing with conda-forge)
|
|
@@ -5,12 +5,12 @@ build-backend = "setuptools.build_meta"
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "PyPowder"
|
|
7
7
|
dynamic = ["version"]
|
|
8
|
-
authors = [
|
|
9
|
-
{ name="Diogo Almeida"},
|
|
10
|
-
{ name="Max Pelly"},
|
|
11
|
-
]
|
|
12
8
|
maintainers = [
|
|
13
|
-
|
|
9
|
+
{ name="Diogo Almeida", email="dafda1@st-andrews.ac.uk" },
|
|
10
|
+
]
|
|
11
|
+
authors = [
|
|
12
|
+
{ name="Diogo Almeida" },
|
|
13
|
+
{ name="Max Pelly" },
|
|
14
14
|
]
|
|
15
15
|
description = "Attempt at constructing a set of tools to convert XRDML files to a more usable format."
|
|
16
16
|
readme = "README.md"
|
|
@@ -28,8 +28,8 @@ license = "GPL-3.0-or-later"
|
|
|
28
28
|
license-files = ["LICEN[CS]E*"]
|
|
29
29
|
|
|
30
30
|
[project.urls]
|
|
31
|
-
Homepage = "https://github.com/
|
|
32
|
-
Issues = "https://github.com/
|
|
31
|
+
Homepage = "https://github.com/dafda1/PyPOW"
|
|
32
|
+
Issues = "https://github.com/dafda1/PyPOW/issues"
|
|
33
33
|
|
|
34
34
|
[project.scripts]
|
|
35
35
|
PyPOW = "PyPOW.__main__:convert_files"
|
|
@@ -11,7 +11,7 @@ import numpy as np
|
|
|
11
11
|
from PyPOW.import_module import import_xrdml_data
|
|
12
12
|
from PyPOW.import_module import extract_intended_wavelength as get_wvl
|
|
13
13
|
|
|
14
|
-
|
|
14
|
+
import sys
|
|
15
15
|
|
|
16
16
|
#%% define conversion functions
|
|
17
17
|
|
|
@@ -39,10 +39,10 @@ def convert_file (filename):
|
|
|
39
39
|
#%% run conversions
|
|
40
40
|
def convert_files():
|
|
41
41
|
|
|
42
|
-
if len(argv) < 2:
|
|
42
|
+
if len(sys.argv) < 2:
|
|
43
43
|
raise ValueError("Must specify filenames to convert.")
|
|
44
44
|
else:
|
|
45
|
-
files_to_convert = argv[1:]
|
|
45
|
+
files_to_convert = sys.argv[1:]
|
|
46
46
|
|
|
47
47
|
for filename in files_to_convert:
|
|
48
48
|
print(f">> Converting file {filename}.")
|
|
@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
|
|
|
18
18
|
commit_id: str | None
|
|
19
19
|
__commit_id__: str | None
|
|
20
20
|
|
|
21
|
-
__version__ = version = '
|
|
22
|
-
__version_tuple__ = version_tuple = (
|
|
21
|
+
__version__ = version = '1.0'
|
|
22
|
+
__version_tuple__ = version_tuple = (1, 0)
|
|
23
23
|
|
|
24
|
-
__commit_id__ = commit_id = '
|
|
24
|
+
__commit_id__ = commit_id = 'g7c3287c97'
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: PyPowder
|
|
3
|
-
Version:
|
|
3
|
+
Version: 1.0
|
|
4
4
|
Summary: Attempt at constructing a set of tools to convert XRDML files to a more usable format.
|
|
5
5
|
Author: Diogo Almeida, Max Pelly
|
|
6
6
|
Maintainer-email: Diogo Almeida <dafda1@st-andrews.ac.uk>
|
|
7
7
|
License-Expression: GPL-3.0-or-later
|
|
8
|
-
Project-URL: Homepage, https://github.com/
|
|
9
|
-
Project-URL: Issues, https://github.com/
|
|
8
|
+
Project-URL: Homepage, https://github.com/dafda1/PyPOW
|
|
9
|
+
Project-URL: Issues, https://github.com/dafda1/PyPOW/issues
|
|
10
10
|
Classifier: Programming Language :: Python :: 3
|
|
11
11
|
Classifier: Operating System :: OS Independent
|
|
12
12
|
Requires-Python: >=3.9
|
|
@@ -21,3 +21,7 @@ Dynamic: license-file
|
|
|
21
21
|
Attempt at constructing a set of tools to convert XRDML files to a more usable format,
|
|
22
22
|
developed for *_1.XRDML files as generated by PANanalytical Empyrian Cu-Kalpha diffractometers
|
|
23
23
|
JOHN and PAUL at the University of St Andrews.
|
|
24
|
+
|
|
25
|
+
## Contributions
|
|
26
|
+
Thanks to Max Pelly for
|
|
27
|
+
- restructuring files for deployment (ongoing with conda-forge)
|
|
@@ -4,6 +4,8 @@ LICENCE
|
|
|
4
4
|
README.md
|
|
5
5
|
RunConversion.bat
|
|
6
6
|
pyproject.toml
|
|
7
|
+
working_example.py
|
|
8
|
+
.github/workflows/python-app.yml
|
|
7
9
|
.github/workflows/python-publish.yml
|
|
8
10
|
src/PyPOW/__init__.py
|
|
9
11
|
src/PyPOW/__main__.py
|
|
@@ -19,7 +21,6 @@ src/PyPowder.egg-info/scm_version.json
|
|
|
19
21
|
src/PyPowder.egg-info/top_level.txt
|
|
20
22
|
tests/ASG1_1.XRDML
|
|
21
23
|
tests/ASG1_1.csv
|
|
22
|
-
tests/ASG1_1.gsas
|
|
23
24
|
tests/ASG1_1.xy
|
|
24
|
-
tests/
|
|
25
|
-
tests/
|
|
25
|
+
tests/test___main__.py
|
|
26
|
+
tests/test_import_module.py
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"files": [
|
|
3
|
-
"README.md",
|
|
4
3
|
"LICENCE",
|
|
5
|
-
"
|
|
4
|
+
".gitignore",
|
|
6
5
|
"RunConversion.bat",
|
|
6
|
+
"README.md",
|
|
7
|
+
"working_example.py",
|
|
7
8
|
".gitattributes",
|
|
8
|
-
".
|
|
9
|
-
"src/PyPOW/__init__.py",
|
|
9
|
+
"pyproject.toml",
|
|
10
10
|
"src/PyPOW/import_module.py",
|
|
11
11
|
"src/PyPOW/__main__.py",
|
|
12
|
-
"
|
|
12
|
+
"src/PyPOW/__init__.py",
|
|
13
|
+
".github/workflows/python-app.yml",
|
|
14
|
+
".github/workflows/python-publish.yml",
|
|
13
15
|
"tests/ASG1_1.csv",
|
|
16
|
+
"tests/test___main__.py",
|
|
17
|
+
"tests/test_import_module.py",
|
|
14
18
|
"tests/ASG1_1.XRDML",
|
|
15
|
-
"tests/ASG1_1.
|
|
16
|
-
"tests/working_example.py",
|
|
17
|
-
"tests/ASG1_1.xy",
|
|
18
|
-
".github/workflows/python-publish.yml"
|
|
19
|
+
"tests/ASG1_1.xy"
|
|
19
20
|
]
|
|
20
21
|
}
|