Skip to content

Commit 77314a1

Browse files
fix typo and add examples
1 parent d791c63 commit 77314a1

File tree

2 files changed

+31
-5
lines changed

2 files changed

+31
-5
lines changed

doc/source/examples/tools_example.rst

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The function will return
4141

4242
.. code-block:: python
4343
44-
{"owner_email": "janedoe@email.com", "owner_name": "Jane Doe", "owner_orcid": "0000-0000-0000-0000"}
44+
{"owner_name": "Jane Doe", "owner_email": "janedoe@email.com", "owner_orcid": "0000-0000-0000-0000"}
4545
4646
4747
Where does ``get_user_info()`` get the user information from?
@@ -77,6 +77,7 @@ When building an application where you want to capture data-owner information, w
7777
``check_and_build_global_config()`` first followed by ``get_user_info`` in your app workflow. E.g.,
7878

7979
.. code-block:: python
80+
8081
from diffpy.utils.tools import check_and_build_global_config, get_user_info
8182
from datetime import datetime
8283
import json
@@ -95,12 +96,32 @@ it will only run once. However, if you want to bypass this behavior,
9596
``check_and_build_global_config()`` takes an optional boolean ``skip_config_creation`` parameter that
9697
could be set to ``True`` at runtime to override the config creation.
9798

99+
What happens when you run ``check_and_build_global_config()``?
100+
--------------------------------------------------------------
101+
102+
When you set ``skip_config_creation`` to ``False`` and there is no existing global configuration file,
103+
the function will prompt you for inputs (name, email, ORCID).
104+
An example of the prompts you may see is:
105+
106+
.. code-block:: python
107+
108+
Please enter the name you would want future work to be credited to: Jane Doe
109+
Please enter your email: janedoe@example.com
110+
Please enter your orcid ID if you know it: 0000-0000-0000-0000
111+
112+
113+
After receiving the inputs, the function will write the following to the file:
114+
115+
.. code-block:: python
116+
{"owner_name": "Jane Doe", "owner_email": "janedoe@email.com", "owner_orcid": "0000-0000-0000-0000"}
117+
118+
98119
I entered the wrong information in my config file so it always loads incorrect information, how do I fix that?
99120
--------------------------------------------------------------------------------------------------------------
100121

101122
It is easy to fix this simply by deleting the global and/or local config files, which will allow
102123
you to re-enter the information during the ``check_and_build_global_config()`` initialization
103-
workflow. You can also simply editi the ``diffpyconfig.json`` file directly using a text
124+
workflow. You can also simply edit the ``diffpyconfig.json`` file directly using a text
104125
editor.
105126

106127
Locate the file ``diffpyconfig.json``, in your home directory and open it in an editor ::
@@ -111,7 +132,7 @@ Locate the file ``diffpyconfig.json``, in your home directory and open it in an
111132
"owner_orcid": "0000-0000-4321-1234"
112133
}
113134

114-
Then you can edit the username and email as needed, make sure to save your edits.
135+
Then you can edit the username and email as needed, make sure to save your edits.
115136

116137
Automatically Capture Info about a Software Package Being Used
117138
==============================================================

doc/source/utilities/tools_utility.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ Tools Utility
55

66
The ``diffpy.utils.tools`` module provides tool functions for use with diffpy apps.
77

8-
- ``get_user_info()``: This function is designed for managing and tracking username and email information.
9-
8+
- ``get_user_info()``: This function is designed for managing and tracking user information (name, email, orcid).
109
Developers can use this function to simplify the process of loading, merging, and saving information consistently and easily.
1110
Additionally, it saves the effort of re-entering information, and allows overriding current information by
1211
passing parameters.
1312

13+
- ``check_and_build_global_config()``: This function helps create a global configuration file
14+
that can be used by ``get_user_info()``.
15+
If no existing configuration file is found, and the user allows inputs, this function prompts for information.
16+
The provided inputs are then saved to a global configuration file.
17+
This file can be reused later by ``get_user_info()`` to ensure that the work credits and user information are consistently stored.
18+
1419
- ``get_package_info()``: This function loads package name and version information into a dictionary.
1520
It updates the package information under the key "package_info" in the format {"package_name": "version_number"},
1621
resulting in an entry in the passed metadata dictionary that looks like

0 commit comments

Comments
 (0)