diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d1bc376..9b0abfd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +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. \ 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 :: 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)