diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7576ab3..4a72b0d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,4 +10,3 @@ Release notes **Removed:** * Remove support for Python 3.11. - diff --git a/CODE-OF-CONDUCT.rst b/CODE-OF-CONDUCT.rst index e8199ca..25fafe2 100644 --- a/CODE-OF-CONDUCT.rst +++ b/CODE-OF-CONDUCT.rst @@ -67,7 +67,7 @@ Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -sb2896@columbia.edu. All complaints will be reviewed and investigated promptly and fairly. +sbillinge@ucsb.edu. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the reporter of any incident. diff --git a/LICENSE_DANSE.rst b/LICENSE_DANSE.rst index c92ca2d..9e65c74 100644 --- a/LICENSE_DANSE.rst +++ b/LICENSE_DANSE.rst @@ -6,7 +6,7 @@ the City of New York. All rights reserved. For more information please visit the diffpy web-page at http://www.diffpy.org -or email Prof. Simon Billinge at sb2896@columbia.edu. +or email Prof. Simon Billinge at sbillinge@ucsb.edu. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.rst b/README.rst index b962781..a87f8f6 100644 --- a/README.rst +++ b/README.rst @@ -129,7 +129,7 @@ Before contributing, please read our `Code of Conduct `_ or email Simon Billinge at sb2896@columbia.edu. +For more information on diffpy.cmisas please visit the project `web-page `_ or email Simon Billinge at sbillinge@ucsb.edu. Acknowledgements ---------------- diff --git a/cookiecutter.json b/cookiecutter.json index 17213b6..fe07600 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -1,6 +1,6 @@ { "maintainer_name": "Simon Billinge", - "maintainer_email": "sb2896@columbia.edu", + "maintainer_email": "sbillinge@ucsb.edu", "maintainer_github_username": "sbillinge", "contributors": "Caden Myers, Simon Billinge, and members of the Billinge group", "license_holders": "Simon Billinge", diff --git a/news/fix-email.rst b/news/fix-email.rst new file mode 100644 index 0000000..e799645 --- /dev/null +++ b/news/fix-email.rst @@ -0,0 +1,23 @@ +**Added:** + +* No news added: update simons email + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* diff --git a/pyproject.toml b/pyproject.toml index 027a521..d38f066 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,10 +6,10 @@ build-backend = "setuptools.build_meta" name = "diffpy.cmisas" dynamic=['version', 'dependencies'] authors = [ - { name="Simon Billinge", email="sb2896@columbia.edu" }, + { name="Simon Billinge", email="sbillinge@ucsb.edu" }, ] maintainers = [ - { name="Simon Billinge", email="sb2896@columbia.edu" }, + { name="Simon Billinge", email="sbillinge@ucsb.edu" }, ] description = "The code of the SAS pack of the diffpy.cmi package." keywords = ['Small angle scattering', 'PDF', 'x-ray neutron'] diff --git a/src/diffpy/cmisas/sasgenerator.py b/src/diffpy/cmisas/sasgenerator.py index 337f83d..e0d1b14 100644 --- a/src/diffpy/cmisas/sasgenerator.py +++ b/src/diffpy/cmisas/sasgenerator.py @@ -20,8 +20,8 @@ __all__ = ["SASGenerator"] -from diffpy.srfit.fitbase import ProfileGenerator from diffpy.cmisas.sasparameter import SASParameter +from diffpy.srfit.fitbase import ProfileGenerator class SASGenerator(ProfileGenerator):