-
Notifications
You must be signed in to change notification settings - Fork 18
Addressing Issue 85 #87
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
67ebedf
changed <don't> to <do not>, messing around to learn
cadenmyers13 a2601bc
removed duplicate conda config...
cadenmyers13 ca9f86d
addresses issue 85, added --yes and replaced easy_install with pip
cadenmyers13 103d628
Issue 85 fixing status badge
cadenmyers13 a9a67b6
updating badge attempt 1
cadenmyers13 62ea1b1
updating badge attempt 2
cadenmyers13 4430ba3
removed duplicate conda update diffpy.pdfmorph and changed line 90 to…
cadenmyers13 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
|
||
.. image:: https://travis-ci.org/diffpy/diffpy.pdfmorph.svg?branch=master | ||
:target: https://travis-ci.org/diffpy/diffpy.pdfmorph | ||
|
||
.. image:: https://github.com/diffpy/diffpy.pdfmorph/actions/workflows/main.yml/badge.svg | ||
:target: https://github.com/diffpy/diffpy.pdfmorph/actions/workflows/main.yml | ||
|
||
.. image:: http://codecov.io/github/diffpy/diffpy.pdfmorph/coverage.svg?branch=master | ||
:target: http://codecov.io/github/diffpy/diffpy.pdfmorph?branch=master | ||
|
@@ -9,6 +10,7 @@ | |
PDFmorph | ||
======================================================================== | ||
|
||
|
||
PDFmorph is a Python software package designed to increase the insight | ||
researchers can obtain from measured atomic pair distribution functions | ||
(PDFs) in a model-independent way. The program was designed to help a | ||
|
@@ -77,7 +79,7 @@ conda and test that it is working by opening a terminal and typing | |
To create and activate a conda environment to use this software, run | ||
the following command from the command line :: | ||
|
||
conda create -n pdfmorph_env python=3 | ||
conda create -n pdfmorph_env python=3 --yes | ||
source activate pdfmorph_env | ||
|
||
If you're using Windows, replace ``source activate pdfmorph`` with | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please check this. I think that maybe this is no longer needed. |
||
|
@@ -99,25 +101,15 @@ either :: | |
|
||
conda config --add channels conda-forge | ||
conda install diffpy.pdfmorph | ||
|
||
or :: | ||
|
||
conda config --add channels conda-forge | ||
conda install diffpy.pdfmorph | ||
|
||
If you don't use conda or prefer to install from sources, please | ||
|
||
If you do not use conda or prefer to install from sources, please | ||
consult online documentation. | ||
|
||
With conda, PDFmorph can be later upgraded to the latest released | ||
version using :: | ||
|
||
conda update diffpy.pdfmorph | ||
|
||
With other Python distributions the program can be upgraded to | ||
the latest version as follows :: | ||
|
||
easy_install --upgrade diffpy.pdfmorph | ||
|
||
|
||
USING PDFmorph | ||
------------------------------------------------------------------------ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.