Skip to content

Commit ae9d65f

Browse files
authored
Merge pull request #112 from sbillinge/sp3
sp3
2 parents 67adf1e + e223401 commit ae9d65f

15 files changed

+502
-400
lines changed

.codecov.yml

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,14 @@
1-
# codecov can find this file anywhere in the repo, so we don't need to clutter
2-
# the root folder.
3-
#comment: false
4-
5-
codecov:
6-
notify:
7-
require_ci_to_pass: no
8-
91
coverage:
102
status:
11-
patch:
3+
project: # more options at https://docs.codecov.com/docs/commit-status
124
default:
13-
target: "80"
14-
if_no_uploads: error
15-
if_not_found: success
16-
if_ci_failed: failure
17-
project:
18-
default: false
19-
library:
20-
target: auto
21-
if_no_uploads: error
22-
if_not_found: success
23-
if_ci_failed: failure
24-
paths: "!*/tests/.*"
25-
26-
tests:
27-
target: 97.9%
28-
paths: "*/tests/.*"
29-
30-
flags:
31-
tests:
32-
paths:
33-
- tests/
5+
target: auto # use the coverage from the base commit, fail if coverage is lower
6+
threshold: 0% # allow the coverage to drop by
7+
8+
comment:
9+
layout: " diff, flags, files"
10+
behavior: default
11+
require_changes: false
12+
require_base: false # [true :: must have a base report to post]
13+
require_head: false # [true :: must have a head report to post]
14+
hide_project_coverage: false # [true :: only show coverage on the git diff aka patch coverage]

.coveragerc

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

.gitarchive.cfg

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

.gitattributes

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

AUTHORS.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Authors
2+
=======
3+
4+
Christopher Farrow, Pavol Juhas, Simon J. L. Billinge, and members of the Billinge Group
5+
6+
Contributors
7+
------------
8+
9+
For a list of contributors, visit
10+
https://github.com/diffpy/diffpy.srfit/graphs/contributors

AUTHORS.txt

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

CHANGELOG.md

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

CHANGELOG.rst

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
=============
2+
Release notes
3+
=============
4+
5+
.. current developments
6+
7+
Version 3.0.0 – 2019-03-14
8+
==========================
9+
10+
**Added:**
11+
12+
* Support for Python 3.7, 3.6, 3.5 in addition to 2.7.
13+
14+
**Changed:**
15+
16+
* Always use lower-case imports from `diffpy.structure`.
17+
* Use numeric-value sort to order variables in `PrintFitHook`.
18+
19+
**Deprecated:**
20+
21+
* Variable `__gitsha__` in the `version` module renamed to `__git_commit__`.
22+
23+
**Removed:**
24+
25+
* Optional upper and lower-bound arguments in `Parameter.setValue`.
26+
The bounds can be set with `Parameter.boundRange` instead.
27+
* Unused classes `ListOperator`, `SetOperator`.
28+
29+
**Fixed:**
30+
31+
* Metadata retrieval from `PDFContribution` hierarchy.
32+
* Refresh `PDFGenerator` when its `rgrid` is changed in-place.
33+
* Zero division in the `nppdfsas.py` example.
34+
* Crash in `ellipsoidsas.py` example because of bug in `Parameter.setValue`.
35+
* Pickling of `ProfileGenerator` objects and of bound class methods.
36+
* Invalid escape sequences in string values.

CODE_OF_CONDUCT.rst

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
=====================================
2+
Contributor Covenant Code of Conduct
3+
=====================================
4+
5+
Our Pledge
6+
----------
7+
8+
We as members, contributors, and leaders pledge to make participation in our
9+
community a harassment-free experience for everyone, regardless of age, body
10+
size, visible or invisible disability, ethnicity, sex characteristics, gender
11+
identity and expression, level of experience, education, socioeconomic status,
12+
nationality, personal appearance, race, caste, color, religion, or sexual
13+
identity and orientation.
14+
15+
We pledge to act and interact in ways that contribute to an open, welcoming,
16+
diverse, inclusive, and healthy community.
17+
18+
Our Standards
19+
-------------
20+
21+
Examples of behavior that contributes to a positive environment for our
22+
community include:
23+
24+
* Demonstrating empathy and kindness toward other people
25+
* Being respectful of differing opinions, viewpoints, and experiences
26+
* Giving and gracefully accepting constructive feedback
27+
* Accepting responsibility and apologizing to those affected by our mistakes,
28+
and learning from the experience
29+
* Focusing on what is best not just for us as individuals, but for the overall
30+
community
31+
32+
Examples of unacceptable behavior include:
33+
34+
* The use of sexualized language or imagery, and sexual attention or advances of
35+
any kind
36+
* Trolling, insulting or derogatory comments, and personal or political attacks
37+
* Public or private harassment
38+
* Publishing others' private information, such as a physical or email address,
39+
without their explicit permission
40+
* Other conduct which could reasonably be considered inappropriate in a
41+
professional setting
42+
43+
Enforcement Responsibilities
44+
----------------------------
45+
46+
Community leaders are responsible for clarifying and enforcing our standards of
47+
acceptable behavior and will take appropriate and fair corrective action in
48+
response to any behavior that they deem inappropriate, threatening, offensive,
49+
or harmful.
50+
51+
Community leaders have the right and responsibility to remove, edit, or reject
52+
comments, commits, code, wiki edits, issues, and other contributions that are
53+
not aligned to this Code of Conduct, and will communicate reasons for moderation
54+
decisions when appropriate.
55+
56+
Scope
57+
-----
58+
59+
This Code of Conduct applies within all community spaces, and also applies when
60+
an individual is officially representing the community in public spaces.
61+
Examples of representing our community include using an official email address,
62+
posting via an official social media account, or acting as an appointed
63+
representative at an online or offline event.
64+
65+
Enforcement
66+
-----------
67+
68+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
69+
reported to the community leaders responsible for enforcement at
70+
[email protected]. All complaints will be reviewed and investigated promptly and fairly.
71+
72+
All community leaders are obligated to respect the privacy and security of the
73+
reporter of any incident.
74+
75+
Enforcement Guidelines
76+
----------------------
77+
78+
Community leaders will follow these Community Impact Guidelines in determining
79+
the consequences for any action they deem in violation of this Code of Conduct:
80+
81+
1. Correction
82+
****************
83+
84+
**Community Impact**: Use of inappropriate language or other behavior deemed
85+
unprofessional or unwelcome in the community.
86+
87+
**Consequence**: A private, written warning from community leaders, providing
88+
clarity around the nature of the violation and an explanation of why the
89+
behavior was inappropriate. A public apology may be requested.
90+
91+
2. Warning
92+
*************
93+
94+
**Community Impact**: A violation through a single incident or series of
95+
actions.
96+
97+
**Consequence**: A warning with consequences for continued behavior. No
98+
interaction with the people involved, including unsolicited interaction with
99+
those enforcing the Code of Conduct, for a specified period of time. This
100+
includes avoiding interactions in community spaces as well as external channels
101+
like social media. Violating these terms may lead to a temporary or permanent
102+
ban.
103+
104+
3. Temporary Ban
105+
******************
106+
107+
**Community Impact**: A serious violation of community standards, including
108+
sustained inappropriate behavior.
109+
110+
**Consequence**: A temporary ban from any sort of interaction or public
111+
communication with the community for a specified period of time. No public or
112+
private interaction with the people involved, including unsolicited interaction
113+
with those enforcing the Code of Conduct, is allowed during this period.
114+
Violating these terms may lead to a permanent ban.
115+
116+
4. Permanent Ban
117+
******************
118+
119+
**Community Impact**: Demonstrating a pattern of violation of community
120+
standards, including sustained inappropriate behavior, harassment of an
121+
individual, or aggression toward or disparagement of classes of individuals.
122+
123+
**Consequence**: A permanent ban from any sort of public interaction within the
124+
community.
125+
126+
Attribution
127+
-----------
128+
129+
This Code of Conduct is adapted from the `Contributor Covenant <https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>`_.
130+
131+
Community Impact Guidelines were inspired by `Mozilla's code of conduct enforcement ladder <https://github.com/mozilla/inclusion>`_.
132+
133+
For answers to common questions about this code of conduct, see the `FAQ <https://www.contributor-covenant.org/faq>`_. `Translations are available <https://www.contributor-covenant.org/translations>`_

LICENSE.txt renamed to LICENSE.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ Copyright (c) 2014, Australian Synchrotron Research Program Inc., ("ASRP")
99
Copyright (c) 2006-2007, Board of Trustees of Michigan State University
1010
Copyright (c) 2008-2012, The Trustees of Columbia University in the City
1111
of New York
12-
1312
Copyright (c) 2014-2019, Brookhaven Science Associates, Brookhaven National
1413
Laboratory
14+
Copyright (c) 2020-2025, The Trustees of Columbia University in the City
15+
of New York
1516

1617

1718
The "DiffPy-CMI" is distributed subject to the following license conditions:
File renamed without changes.

MANIFEST.in

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
recursive-include src *
2-
include AUTHORS.txt LICENSE*.txt README.rst
3-
recursive-exclude src *.pyc
4-
global-exclude .gitattributes .gitignore .gitarchive.cfg
5-
global-exclude .DS_Store
1+
graft src
2+
graft tests
3+
graft requirements
64

7-
# Avoid user content in setup.cfg to make distribution reproducible.
8-
exclude setup.cfg
5+
include AUTHORS.rst LICENSE*.rst README.rst
96

10-
# Exclude git-tracked files spuriously added by setuptools_scm
7+
# Exclude all bytecode files and __pycache__ directories
8+
global-exclude *.py[cod] # Exclude all .pyc, .pyo, and .pyd files.
9+
global-exclude .DS_Store # Exclude Mac filesystem artifacts.
10+
global-exclude __pycache__ # Exclude Python cache directories.
11+
global-exclude .git* # Exclude git files and directories.
12+
global-exclude .idea # Exclude PyCharm project settings.
1113
exclude .codecov.yml
1214
exclude .coveragerc
13-
exclude .travis*
14-
prune conda-recipe
15-
prune devutils
16-
prune doc

0 commit comments

Comments
 (0)