Skip to content

Update doc -- testing #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dragonyanglong wants to merge 7 commits into from
Closed

Update doc -- testing #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
72481c0
DOC: update conda-forge installation instruction
dragonyanglong Feb 27, 2023
2d5e504
REL: bump up version.
dragonyanglong Feb 27, 2023
bb6bb28
extra space
dragonyanglong Feb 27, 2023
9ac9545
remove space
dragonyanglong Feb 27, 2023
5372869
space
dragonyanglong Feb 27, 2023
a06b4db
space
dragonyanglong Feb 27, 2023
f1e45e1
space
dragonyanglong Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

- 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.
5 changes: 2 additions & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ::
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down