Skip to content
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

Addressing Issue 85 #87

Merged
merged 7 commits into from
Apr 1, 2024
Merged

Addressing Issue 85 #87

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 Mar 9, 2024
a2601bc
removed duplicate conda config...
cadenmyers13 Mar 10, 2024
ca9f86d
addresses issue 85, added --yes and replaced easy_install with pip
cadenmyers13 Mar 10, 2024
103d628
Issue 85 fixing status badge
cadenmyers13 Mar 18, 2024
a9a67b6
updating badge attempt 1
cadenmyers13 Mar 26, 2024
62ea1b1
updating badge attempt 2
cadenmyers13 Mar 26, 2024
4430ba3
removed duplicate conda update diffpy.pdfmorph and changed line 90 to…
cadenmyers13 Mar 26, 2024
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
22 changes: 7 additions & 15 deletions README.rst
View file
Open in desktop
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
sbillinge marked this conversation as resolved.
Show resolved Hide resolved
: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
Expand All @@ -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
Expand Down Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please check this. I think that maybe this is no longer needed.

Expand All @@ -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
------------------------------------------------------------------------
Expand Down
Loading