From 67ebedf0d99e0c6ff80b7d2cfafc966350fbe03e Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Sat, 9 Mar 2024 16:34:26 -0500 Subject: [PATCH 1/7] changed to , messing around to learn --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 7963a9b2..6e8f8171 100644 --- a/README.rst +++ b/README.rst @@ -104,8 +104,8 @@ 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 From a2601bcfb979b7f0509e532cdfe517e4506240dc Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Sun, 10 Mar 2024 16:43:52 -0400 Subject: [PATCH 2/7] removed duplicate conda config... --- README.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.rst b/README.rst index 6e8f8171..61206ab2 100644 --- a/README.rst +++ b/README.rst @@ -99,11 +99,6 @@ either :: conda config --add channels conda-forge conda install diffpy.pdfmorph - -or :: - - conda config --add channels conda-forge - conda install diffpy.pdfmorph If you do not use conda or prefer to install from sources, please consult online documentation. From ca9f86d994a652778d9c1235369f36c288939fc6 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Sun, 10 Mar 2024 18:01:05 -0400 Subject: [PATCH 3/7] addresses issue 85, added --yes and replaced easy_install with pip --- README.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 61206ab2..86d0969e 100644 --- a/README.rst +++ b/README.rst @@ -9,6 +9,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 +78,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 @@ -111,7 +112,7 @@ version using :: With other Python distributions the program can be upgraded to the latest version as follows :: - easy_install --upgrade diffpy.pdfmorph + pip install diffpy.pdfmorph USING PDFmorph From 103d6280a63a6f49adeb41c265fb96fa1d6ad149 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 18 Mar 2024 19:42:08 -0400 Subject: [PATCH 4/7] Issue 85 fixing status badge --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 86d0969e..e05caa73 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ -.. image:: https://travis-ci.org/diffpy/diffpy.pdfmorph.svg?branch=master - :target: https://travis-ci.org/diffpy/diffpy.pdfmorph +.. image:: https://img.shields.io/codecov/c/github/diffpy/diffpy.pdfmorph + :target: https://app.codecov.io/gh/diffpy/diffpy.pdfmorph .. image:: http://codecov.io/github/diffpy/diffpy.pdfmorph/coverage.svg?branch=master :target: http://codecov.io/github/diffpy/diffpy.pdfmorph?branch=master From a9a67b67a76870980d3be7686ca525ea8bd7aafd Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 25 Mar 2024 21:23:51 -0400 Subject: [PATCH 5/7] updating badge attempt 1 --- README.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index e05caa73..7a40099c 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,9 @@ -.. image:: https://img.shields.io/codecov/c/github/diffpy/diffpy.pdfmorph - :target: https://app.codecov.io/gh/diffpy/diffpy.pdfmorph +[![CI](https://github.com/diffpy/diffpy.pdfmorph/actions/workflows/main.yml/badge.svg)](https://github.com/diffpy/diffpy.pdfmorph/actions/workflows/main.yml) + + +#.. image:: https://img.shields.io/codecov/c/github/diffpy/diffpy.pdfmorph +# :target: https://app.codecov.io/gh/diffpy/diffpy.pdfmorph .. image:: http://codecov.io/github/diffpy/diffpy.pdfmorph/coverage.svg?branch=master :target: http://codecov.io/github/diffpy/diffpy.pdfmorph?branch=master @@ -112,7 +115,7 @@ version using :: With other Python distributions the program can be upgraded to the latest version as follows :: - pip install diffpy.pdfmorph + conda update diffpy.pdfmorph USING PDFmorph From 62ea1b1517c474fc0e46f4a834f01aff396b9dd6 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 25 Mar 2024 21:26:47 -0400 Subject: [PATCH 6/7] updating badge attempt 2 --- README.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 7a40099c..780acae9 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,7 @@ -[![CI](https://github.com/diffpy/diffpy.pdfmorph/actions/workflows/main.yml/badge.svg)](https://github.com/diffpy/diffpy.pdfmorph/actions/workflows/main.yml) - -#.. image:: https://img.shields.io/codecov/c/github/diffpy/diffpy.pdfmorph -# :target: https://app.codecov.io/gh/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 From 4430ba3dc9388bc07f16bf120cef1f1ea09ab9c8 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 25 Mar 2024 22:53:33 -0400 Subject: [PATCH 7/7] removed duplicate conda update diffpy.pdfmorph and changed line 90 to conda deactivate --- README.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.rst b/README.rst index 780acae9..d8ea7b9b 100644 --- a/README.rst +++ b/README.rst @@ -110,11 +110,6 @@ version using :: conda update diffpy.pdfmorph -With other Python distributions the program can be upgraded to -the latest version as follows :: - - conda update diffpy.pdfmorph - USING PDFmorph ------------------------------------------------------------------------