Replace Caden's PR (#160)

Tieqiong · web-flow · commit 0652110fa627 · 2024-08-15T18:00:33.000-04:00
Minor copyright fixes and news update
diff --git 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
@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+*  Package reformatted to comply with new Billinge Group package structure
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>
diff --git 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
@@ -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
@@ -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
@@ -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.
 #
 ##############################################################################
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-numpy==1.26`
	`1`	`+numpy < 2.0.0 # Need to fix deprecations before 2.0.0 compat`
`2`	`2`	`wxpython`
`3`	`3`	`diffpy.pdffit2`
`4`	`4`	`diffpy.utils`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# wxextensions by DANSE Diffraction group`
`6`	`6`	`# Simon J. L. Billinge`
`7`		`-# (c) 2009 trustees of Columbia University in the City of`
	`7`	`+# (c) 2009-2024 trustees of Columbia University in the City of`
`8`	`8`	`# New York.`
`9`	`9`	`# All rights reserved.`
`10`	`10`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,16 @@`
`1`	`1`	`#!/usr/bin/env python`
`2`	`2`	`##############################################################################`
`3`	`3`	`#`
`4`		`-# diffpy.pdfgui Complex Modeling Initiative`
`5`		`-# (c) 2016 Brookhaven Science Associates,`
`6`		`-# Brookhaven National Laboratory.`
`7`		`-# All rights reserved.`
	`4`	`+# (c) 2016 Brookhaven Science Associates, Brookhaven National Laboratory.`
	`5`	`+# (c) 2024 The Trustees of Columbia University in the City of New York.`
	`6`	`+# All rights reserved.`
`8`	`7`	`#`
`9`		`-# File coded by: Pavol Juhas`
	`8`	`+# File coded by: Billinge Group members and community contributors.`
`10`	`9`	`#`
`11`		`-# See AUTHORS.txt for a list of people who contributed.`
`12`		`-# See LICENSE.txt for license information.`
	`10`	`+# See GitHub contributions for a more detailed list of contributors.`
	`11`	`+# https://github.com/diffpy/diffpy.pdfgui/graphs/contributors`
	`12`	`+#`
	`13`	`+# See LICENSE.rst for license information.`
`13`	`14`	`#`
`14`	`15`	`##############################################################################`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`#!/usr/bin/env python`
`2`	`2`	`##############################################################################`
`3`	`3`	`#`
`4`		`-# diffpy.pdfgui by DANSE Diffraction group`
`5`		`-# Simon J. L. Billinge`
`6`		`-# (c) 2012-2024 Trustees of the Columbia University`
`7`		`-# in the City of New York. All rights reserved.`
	`4`	`+# (c) 2012-2024 The Trustees of Columbia University in the City of New York.`
	`5`	`+# All rights reserved.`
`8`	`6`	`#`
`9`		`-# File coded by: Pavol Juhas`
	`7`	`+# File coded by: Billinge Group members and community contributors.`
`10`	`8`	`#`
`11`		`-# See AUTHORS.txt for a list of people who contributed.`
`12`		`-# See LICENSE.txt for license information.`
	`9`	`+# See GitHub contributions for a more detailed list of contributors.`
	`10`	`+# https://github.com/diffpy/diffpy.pdfgui/graphs/contributors`
	`11`	`+#`
	`12`	`+# See LICENSE.rst for license information.`
`13`	`13`	`#`
`14`	`14`	`##############################################################################`
`15`	`15`