From 72481c0d54e1f7f0ce3717167c4b6c8eadb274e0 Mon Sep 17 00:00:00 2001 From: Long Yang Date: Mon, 27 Feb 2023 16:56:39 +0800 Subject: [PATCH 1/7] DOC: update conda-forge installation instruction --- CHANGELOG.md | 5 +++-- README.rst | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d1bc376..60f72ffa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,5 +18,6 @@ Notable differences from version 1.2. ### Fixed -- Patch variable to avoid naming problems and Xcode collision on MacOS & Linux. -- Fix g++ w/ambiguous isnan on Linux. \ No newline at end of file +- Patch variable to avoid naming problems and Xcode collision on MacOS & Linux. +- Fix g++ w/ambiguous isnan on Linux. +- Fix the PY_SSIZE_T_CLEAN macro for py3.10. diff --git a/README.rst b/README.rst index d0301ab5..bef2a4ce 100644 --- a/README.rst +++ b/README.rst @@ -59,10 +59,9 @@ INSTALLATION ------------------------------------------------------------------------ The preferred method is to use Anaconda Python and install from the -"diffpy" channel of Anaconda packages :: +"conda-forge" channel of Anaconda packages :: - conda config --add channels diffpy - conda install diffpy.pdffit2 + conda install -c conda-forge diffpy.pdffit2 If you don't use Anaconda or prefer to install from sources, make sure the required software is in place and run :: From 2d5e504ef357f1010ed29253d0d648b12b5cd086 Mon Sep 17 00:00:00 2001 From: Long Yang Date: Mon, 27 Feb 2023 16:58:01 +0800 Subject: [PATCH 2/7] REL: bump up version. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a35c12eb..f7e06a7a 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ # Use this version when git data are not available, like in git zip archive. # Update when tagging a new release. -FALLBACK_VERSION = '1.4.0' +FALLBACK_VERSION = '1.4.1' # determine if we run with Python 3. PY3 = (sys.version_info[0] == 3) From bb6bb289434c073dfd77a4f17e5f9e3a4173c0f1 Mon Sep 17 00:00:00 2001 From: Long Yang Date: Mon, 27 Feb 2023 22:37:22 +0800 Subject: [PATCH 3/7] extra space --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60f72ffa..b700562b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Notable differences from version 1.2. ### Removed - Remove the support for Python 3.5, 3.6. - + ### Fixed - Patch variable to avoid naming problems and Xcode collision on MacOS & Linux. From 9ac9545833b2691330e02e6a5c029ba381494056 Mon Sep 17 00:00:00 2001 From: Long Yang Date: Mon, 27 Feb 2023 22:37:39 +0800 Subject: [PATCH 4/7] remove space --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b700562b..60f72ffa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Notable differences from version 1.2. ### Removed - Remove the support for Python 3.5, 3.6. - + ### Fixed - Patch variable to avoid naming problems and Xcode collision on MacOS & Linux. From 5372869e281ed03315f776eafbab25a23c96665c Mon Sep 17 00:00:00 2001 From: Long Yang Date: Mon, 27 Feb 2023 22:49:28 +0800 Subject: [PATCH 5/7] space --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60f72ffa..b700562b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Notable differences from version 1.2. ### Removed - Remove the support for Python 3.5, 3.6. - + ### Fixed - Patch variable to avoid naming problems and Xcode collision on MacOS & Linux. From a06b4db36e6f3e209d5708d93666f2f610921fc8 Mon Sep 17 00:00:00 2001 From: Long Yang Date: Mon, 27 Feb 2023 23:10:19 +0800 Subject: [PATCH 6/7] space --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b700562b..60f72ffa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Notable differences from version 1.2. ### Removed - Remove the support for Python 3.5, 3.6. - + ### Fixed - Patch variable to avoid naming problems and Xcode collision on MacOS & Linux. From f1e45e178c7197ea0c469dc2efacc2cbec1886a4 Mon Sep 17 00:00:00 2001 From: Long Yang Date: Tue, 28 Feb 2023 18:17:15 +0800 Subject: [PATCH 7/7] space --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60f72ffa..9b0abfd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ Notable differences from version 1.2. - Remove the support for Python 3.5, 3.6. ### Fixed - + - Patch variable to avoid naming problems and Xcode collision on MacOS & Linux. - Fix g++ w/ambiguous isnan on Linux. - Fix the PY_SSIZE_T_CLEAN macro for py3.10.