From 68cc9a3471c412d4c082313b34069dc67f7a32c1 Mon Sep 17 00:00:00 2001 From: Simon Billinge <simon.billinge@gmail.com> Date: Tue, 23 Jul 2024 02:40:08 -0400 Subject: [PATCH 1/5] pin numpy to 1.x for now --- requirements/run.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/run.txt b/requirements/run.txt index 10e45f83..70ad6f75 100644 --- a/requirements/run.txt +++ b/requirements/run.txt @@ -1,4 +1,4 @@ -numpy +numpy=1 wxpython diffpy.pdffit2 diffpy.utils From 6ecbc61b5e70aec41e84fd55ce2a2d89cd874c9a Mon Sep 17 00:00:00 2001 From: Simon Billinge <simon.billinge@gmail.com> Date: Thu, 25 Jul 2024 12:37:24 -0400 Subject: [PATCH 2/5] add environment.yml --- environment.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 environment.yml diff --git a/environment.yml b/environment.yml new file mode 100644 index 00000000..a3904941 --- /dev/null +++ b/environment.yml @@ -0,0 +1,6 @@ +name: diffpy.pdfgui +channels: + - conda-forge +dependencies: + - python=3 + - pip From b7ea78775de4d26ea4f73aab9909086abfe7d810 Mon Sep 17 00:00:00 2001 From: Caden Myers <cjm2304@columbia.edu> Date: Mon, 12 Aug 2024 15:30:46 -0400 Subject: [PATCH 3/5] minor changes from other PR --- README.rst | 2 +- news/cookiecutter.rst | 23 +++++++++++++++++++++++ src/diffpy/pdfgui/tests/debug.py | 15 ++++++++------- src/diffpy/pdfgui/tests/run.py | 14 +++++++------- 4 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 news/cookiecutter.rst 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:** + +* <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/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. # ############################################################################## From 782803d0a93ae07185c465475164dbd6e8e6d6e6 Mon Sep 17 00:00:00 2001 From: Caden Myers <cjm2304@columbia.edu> Date: Mon, 12 Aug 2024 15:37:42 -0400 Subject: [PATCH 4/5] copyright update --- src/diffpy/pdfgui/gui/wxextensions/textctrlutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. # From 432eae3cd4ae743e1ea292b22af399f947eeddcc Mon Sep 17 00:00:00 2001 From: Caden Myers <cjm2304@columbia.edu> Date: Mon, 12 Aug 2024 15:49:54 -0400 Subject: [PATCH 5/5] one equals sign for numpy pin --- requirements/run.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/run.txt b/requirements/run.txt index 40bce3f0..70b41489 100644 --- a/requirements/run.txt +++ b/requirements/run.txt @@ -1,4 +1,4 @@ -numpy==1.26 +numpy=1.26 wxpython diffpy.pdffit2 diffpy.utils