diff --git a/README.rst b/README.rst index 809d4f3c..b9d7da0a 100644 --- a/README.rst +++ b/README.rst @@ -47,7 +47,7 @@ help menu and follow the tutorial instructions. A detailed description is available in the doc/Farrow-jpcm-2007.pdf paper. -REQUIREMENTS +Requirements ------------------------------------------------------------------------ PDFgui requires Python 3.8+ or 2.7 and several third-party diff --git a/news/cookiecutter.rst b/news/cookiecutter.rst new file mode 100644 index 00000000..83d30cd4 --- /dev/null +++ b/news/cookiecutter.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* Package reformatted to comply with new Billinge Group package structure + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* diff --git a/requirements/run.txt b/requirements/run.txt index 1bad6988..1d2bb168 100644 --- a/requirements/run.txt +++ b/requirements/run.txt @@ -1,4 +1,4 @@ -numpy==1.26 +numpy < 2.0.0 # Need to fix deprecations before 2.0.0 compat wxpython diffpy.pdffit2 diffpy.utils diff --git a/src/diffpy/pdfgui/gui/wxextensions/textctrlutils.py b/src/diffpy/pdfgui/gui/wxextensions/textctrlutils.py index 496b117f..4820cb8f 100644 --- a/src/diffpy/pdfgui/gui/wxextensions/textctrlutils.py +++ b/src/diffpy/pdfgui/gui/wxextensions/textctrlutils.py @@ -4,7 +4,7 @@ # # wxextensions by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2009 trustees of Columbia University in the City of +# (c) 2009-2024 trustees of Columbia University in the City of # New York. # All rights reserved. # diff --git a/src/diffpy/pdfgui/tests/debug.py b/src/diffpy/pdfgui/tests/debug.py index 28926e22..c26a68d2 100644 --- a/src/diffpy/pdfgui/tests/debug.py +++ b/src/diffpy/pdfgui/tests/debug.py @@ -1,15 +1,16 @@ #!/usr/bin/env python ############################################################################## # -# diffpy.pdfgui Complex Modeling Initiative -# (c) 2016 Brookhaven Science Associates, -# Brookhaven National Laboratory. -# All rights reserved. +# (c) 2016 Brookhaven Science Associates, Brookhaven National Laboratory. +# (c) 2024 The Trustees of Columbia University in the City of New York. +# All rights reserved. # -# File coded by: Pavol Juhas +# File coded by: Billinge Group members and community contributors. # -# See AUTHORS.txt for a list of people who contributed. -# See LICENSE.txt for license information. +# See GitHub contributions for a more detailed list of contributors. +# https://github.com/diffpy/diffpy.pdfgui/graphs/contributors +# +# See LICENSE.rst for license information. # ############################################################################## diff --git a/src/diffpy/pdfgui/tests/run.py b/src/diffpy/pdfgui/tests/run.py index 461d7c01..2184cda6 100644 --- a/src/diffpy/pdfgui/tests/run.py +++ b/src/diffpy/pdfgui/tests/run.py @@ -1,15 +1,15 @@ #!/usr/bin/env python ############################################################################## # -# diffpy.pdfgui by DANSE Diffraction group -# Simon J. L. Billinge -# (c) 2012-2024 Trustees of the Columbia University -# in the City of New York. All rights reserved. +# (c) 2012-2024 The Trustees of Columbia University in the City of New York. +# All rights reserved. # -# File coded by: Pavol Juhas +# File coded by: Billinge Group members and community contributors. # -# See AUTHORS.txt for a list of people who contributed. -# See LICENSE.txt for license information. +# See GitHub contributions for a more detailed list of contributors. +# https://github.com/diffpy/diffpy.pdfgui/graphs/contributors +# +# See LICENSE.rst for license information. # ##############################################################################