Skip to content

Commit 992ea3e

Browse files
kks32kks32
committed
Set numpy and pandas to be compatible
1 parent 72d3fd5 commit 992ea3e

File tree

5 files changed

+145
-151
lines changed

5 files changed

+145
-151
lines changed

Diff for: ‎dapi/auth/auth.py

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ def init():
1010
Tries to read credentials from environment variables first.
1111
If not found, prompts the user for input.
1212
13+
Save the user credentials in the .env file.
14+
```
15+
DESIGNSAFE_USERNAME=<username>
16+
DESIGNSAFE_PASSWORD=<password>
17+
```
18+
1319
Returns:
1420
object: The authenticated Tapis object.
1521
"""

Diff for: ‎docs/dapi/auth/auth.html

+64-46
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,36 @@ <h1 class="modulename">
6666
</span><span id="L-10"><a href="#L-10"><span class="linenos">10</span></a><span class="sd"> Tries to read credentials from environment variables first.</span>
6767
</span><span id="L-11"><a href="#L-11"><span class="linenos">11</span></a><span class="sd"> If not found, prompts the user for input.</span>
6868
</span><span id="L-12"><a href="#L-12"><span class="linenos">12</span></a>
69-
</span><span id="L-13"><a href="#L-13"><span class="linenos">13</span></a><span class="sd"> Returns:</span>
70-
</span><span id="L-14"><a href="#L-14"><span class="linenos">14</span></a><span class="sd"> object: The authenticated Tapis object.</span>
71-
</span><span id="L-15"><a href="#L-15"><span class="linenos">15</span></a><span class="sd"> &quot;&quot;&quot;</span>
72-
</span><span id="L-16"><a href="#L-16"><span class="linenos">16</span></a> <span class="n">base_url</span> <span class="o">=</span> <span class="s2">&quot;https://designsafe.tapis.io&quot;</span>
73-
</span><span id="L-17"><a href="#L-17"><span class="linenos">17</span></a>
74-
</span><span id="L-18"><a href="#L-18"><span class="linenos">18</span></a> <span class="c1"># Load environment variables from .env file</span>
75-
</span><span id="L-19"><a href="#L-19"><span class="linenos">19</span></a> <span class="n">load_dotenv</span><span class="p">()</span>
76-
</span><span id="L-20"><a href="#L-20"><span class="linenos">20</span></a>
77-
</span><span id="L-21"><a href="#L-21"><span class="linenos">21</span></a> <span class="c1"># Try to get credentials from environment variables</span>
78-
</span><span id="L-22"><a href="#L-22"><span class="linenos">22</span></a> <span class="n">username</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">getenv</span><span class="p">(</span><span class="s2">&quot;DESIGNSAFE_USERNAME&quot;</span><span class="p">)</span>
79-
</span><span id="L-23"><a href="#L-23"><span class="linenos">23</span></a> <span class="n">password</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">getenv</span><span class="p">(</span><span class="s2">&quot;DESIGNSAFE_PASSWORD&quot;</span><span class="p">)</span>
80-
</span><span id="L-24"><a href="#L-24"><span class="linenos">24</span></a>
81-
</span><span id="L-25"><a href="#L-25"><span class="linenos">25</span></a> <span class="c1"># If environment variables are not set, prompt user for input</span>
82-
</span><span id="L-26"><a href="#L-26"><span class="linenos">26</span></a> <span class="k">if</span> <span class="ow">not</span> <span class="n">username</span><span class="p">:</span>
83-
</span><span id="L-27"><a href="#L-27"><span class="linenos">27</span></a> <span class="n">username</span> <span class="o">=</span> <span class="nb">input</span><span class="p">(</span><span class="s2">&quot;Enter username: &quot;</span><span class="p">)</span>
84-
</span><span id="L-28"><a href="#L-28"><span class="linenos">28</span></a> <span class="k">if</span> <span class="ow">not</span> <span class="n">password</span><span class="p">:</span>
85-
</span><span id="L-29"><a href="#L-29"><span class="linenos">29</span></a> <span class="n">password</span> <span class="o">=</span> <span class="n">getpass</span><span class="p">(</span><span class="s2">&quot;Enter password: &quot;</span><span class="p">)</span>
69+
</span><span id="L-13"><a href="#L-13"><span class="linenos">13</span></a><span class="sd"> Save the user credentials in the .env file.</span>
70+
</span><span id="L-14"><a href="#L-14"><span class="linenos">14</span></a><span class="sd"> ```</span>
71+
</span><span id="L-15"><a href="#L-15"><span class="linenos">15</span></a><span class="sd"> DESIGNSAFE_USERNAME=&lt;username&gt;</span>
72+
</span><span id="L-16"><a href="#L-16"><span class="linenos">16</span></a><span class="sd"> DESIGNSAFE_PASSWORD=&lt;password&gt;</span>
73+
</span><span id="L-17"><a href="#L-17"><span class="linenos">17</span></a><span class="sd"> ```</span>
74+
</span><span id="L-18"><a href="#L-18"><span class="linenos">18</span></a>
75+
</span><span id="L-19"><a href="#L-19"><span class="linenos">19</span></a><span class="sd"> Returns:</span>
76+
</span><span id="L-20"><a href="#L-20"><span class="linenos">20</span></a><span class="sd"> object: The authenticated Tapis object.</span>
77+
</span><span id="L-21"><a href="#L-21"><span class="linenos">21</span></a><span class="sd"> &quot;&quot;&quot;</span>
78+
</span><span id="L-22"><a href="#L-22"><span class="linenos">22</span></a> <span class="n">base_url</span> <span class="o">=</span> <span class="s2">&quot;https://designsafe.tapis.io&quot;</span>
79+
</span><span id="L-23"><a href="#L-23"><span class="linenos">23</span></a>
80+
</span><span id="L-24"><a href="#L-24"><span class="linenos">24</span></a> <span class="c1"># Load environment variables from .env file</span>
81+
</span><span id="L-25"><a href="#L-25"><span class="linenos">25</span></a> <span class="n">load_dotenv</span><span class="p">()</span>
82+
</span><span id="L-26"><a href="#L-26"><span class="linenos">26</span></a>
83+
</span><span id="L-27"><a href="#L-27"><span class="linenos">27</span></a> <span class="c1"># Try to get credentials from environment variables</span>
84+
</span><span id="L-28"><a href="#L-28"><span class="linenos">28</span></a> <span class="n">username</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">getenv</span><span class="p">(</span><span class="s2">&quot;DESIGNSAFE_USERNAME&quot;</span><span class="p">)</span>
85+
</span><span id="L-29"><a href="#L-29"><span class="linenos">29</span></a> <span class="n">password</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">getenv</span><span class="p">(</span><span class="s2">&quot;DESIGNSAFE_PASSWORD&quot;</span><span class="p">)</span>
8686
</span><span id="L-30"><a href="#L-30"><span class="linenos">30</span></a>
87-
</span><span id="L-31"><a href="#L-31"><span class="linenos">31</span></a> <span class="c1"># Initialize Tapis object</span>
88-
</span><span id="L-32"><a href="#L-32"><span class="linenos">32</span></a> <span class="n">t</span> <span class="o">=</span> <span class="n">Tapis</span><span class="p">(</span><span class="n">base_url</span><span class="o">=</span><span class="n">base_url</span><span class="p">,</span> <span class="n">username</span><span class="o">=</span><span class="n">username</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="n">password</span><span class="p">)</span>
89-
</span><span id="L-33"><a href="#L-33"><span class="linenos">33</span></a>
90-
</span><span id="L-34"><a href="#L-34"><span class="linenos">34</span></a> <span class="n">t</span><span class="o">.</span><span class="n">get_tokens</span><span class="p">()</span>
91-
</span><span id="L-35"><a href="#L-35"><span class="linenos">35</span></a>
92-
</span><span id="L-36"><a href="#L-36"><span class="linenos">36</span></a> <span class="k">return</span> <span class="n">t</span>
87+
</span><span id="L-31"><a href="#L-31"><span class="linenos">31</span></a> <span class="c1"># If environment variables are not set, prompt user for input</span>
88+
</span><span id="L-32"><a href="#L-32"><span class="linenos">32</span></a> <span class="k">if</span> <span class="ow">not</span> <span class="n">username</span><span class="p">:</span>
89+
</span><span id="L-33"><a href="#L-33"><span class="linenos">33</span></a> <span class="n">username</span> <span class="o">=</span> <span class="nb">input</span><span class="p">(</span><span class="s2">&quot;Enter username: &quot;</span><span class="p">)</span>
90+
</span><span id="L-34"><a href="#L-34"><span class="linenos">34</span></a> <span class="k">if</span> <span class="ow">not</span> <span class="n">password</span><span class="p">:</span>
91+
</span><span id="L-35"><a href="#L-35"><span class="linenos">35</span></a> <span class="n">password</span> <span class="o">=</span> <span class="n">getpass</span><span class="p">(</span><span class="s2">&quot;Enter password: &quot;</span><span class="p">)</span>
92+
</span><span id="L-36"><a href="#L-36"><span class="linenos">36</span></a>
93+
</span><span id="L-37"><a href="#L-37"><span class="linenos">37</span></a> <span class="c1"># Initialize Tapis object</span>
94+
</span><span id="L-38"><a href="#L-38"><span class="linenos">38</span></a> <span class="n">t</span> <span class="o">=</span> <span class="n">Tapis</span><span class="p">(</span><span class="n">base_url</span><span class="o">=</span><span class="n">base_url</span><span class="p">,</span> <span class="n">username</span><span class="o">=</span><span class="n">username</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="n">password</span><span class="p">)</span>
95+
</span><span id="L-39"><a href="#L-39"><span class="linenos">39</span></a>
96+
</span><span id="L-40"><a href="#L-40"><span class="linenos">40</span></a> <span class="n">t</span><span class="o">.</span><span class="n">get_tokens</span><span class="p">()</span>
97+
</span><span id="L-41"><a href="#L-41"><span class="linenos">41</span></a>
98+
</span><span id="L-42"><a href="#L-42"><span class="linenos">42</span></a> <span class="k">return</span> <span class="n">t</span>
9399
</span></pre></div>
94100

95101

@@ -111,37 +117,49 @@ <h1 class="modulename">
111117
</span><span id="init-11"><a href="#init-11"><span class="linenos">11</span></a><span class="sd"> Tries to read credentials from environment variables first.</span>
112118
</span><span id="init-12"><a href="#init-12"><span class="linenos">12</span></a><span class="sd"> If not found, prompts the user for input.</span>
113119
</span><span id="init-13"><a href="#init-13"><span class="linenos">13</span></a>
114-
</span><span id="init-14"><a href="#init-14"><span class="linenos">14</span></a><span class="sd"> Returns:</span>
115-
</span><span id="init-15"><a href="#init-15"><span class="linenos">15</span></a><span class="sd"> object: The authenticated Tapis object.</span>
116-
</span><span id="init-16"><a href="#init-16"><span class="linenos">16</span></a><span class="sd"> &quot;&quot;&quot;</span>
117-
</span><span id="init-17"><a href="#init-17"><span class="linenos">17</span></a> <span class="n">base_url</span> <span class="o">=</span> <span class="s2">&quot;https://designsafe.tapis.io&quot;</span>
118-
</span><span id="init-18"><a href="#init-18"><span class="linenos">18</span></a>
119-
</span><span id="init-19"><a href="#init-19"><span class="linenos">19</span></a> <span class="c1"># Load environment variables from .env file</span>
120-
</span><span id="init-20"><a href="#init-20"><span class="linenos">20</span></a> <span class="n">load_dotenv</span><span class="p">()</span>
121-
</span><span id="init-21"><a href="#init-21"><span class="linenos">21</span></a>
122-
</span><span id="init-22"><a href="#init-22"><span class="linenos">22</span></a> <span class="c1"># Try to get credentials from environment variables</span>
123-
</span><span id="init-23"><a href="#init-23"><span class="linenos">23</span></a> <span class="n">username</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">getenv</span><span class="p">(</span><span class="s2">&quot;DESIGNSAFE_USERNAME&quot;</span><span class="p">)</span>
124-
</span><span id="init-24"><a href="#init-24"><span class="linenos">24</span></a> <span class="n">password</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">getenv</span><span class="p">(</span><span class="s2">&quot;DESIGNSAFE_PASSWORD&quot;</span><span class="p">)</span>
125-
</span><span id="init-25"><a href="#init-25"><span class="linenos">25</span></a>
126-
</span><span id="init-26"><a href="#init-26"><span class="linenos">26</span></a> <span class="c1"># If environment variables are not set, prompt user for input</span>
127-
</span><span id="init-27"><a href="#init-27"><span class="linenos">27</span></a> <span class="k">if</span> <span class="ow">not</span> <span class="n">username</span><span class="p">:</span>
128-
</span><span id="init-28"><a href="#init-28"><span class="linenos">28</span></a> <span class="n">username</span> <span class="o">=</span> <span class="nb">input</span><span class="p">(</span><span class="s2">&quot;Enter username: &quot;</span><span class="p">)</span>
129-
</span><span id="init-29"><a href="#init-29"><span class="linenos">29</span></a> <span class="k">if</span> <span class="ow">not</span> <span class="n">password</span><span class="p">:</span>
130-
</span><span id="init-30"><a href="#init-30"><span class="linenos">30</span></a> <span class="n">password</span> <span class="o">=</span> <span class="n">getpass</span><span class="p">(</span><span class="s2">&quot;Enter password: &quot;</span><span class="p">)</span>
120+
</span><span id="init-14"><a href="#init-14"><span class="linenos">14</span></a><span class="sd"> Save the user credentials in the .env file.</span>
121+
</span><span id="init-15"><a href="#init-15"><span class="linenos">15</span></a><span class="sd"> ```</span>
122+
</span><span id="init-16"><a href="#init-16"><span class="linenos">16</span></a><span class="sd"> DESIGNSAFE_USERNAME=&lt;username&gt;</span>
123+
</span><span id="init-17"><a href="#init-17"><span class="linenos">17</span></a><span class="sd"> DESIGNSAFE_PASSWORD=&lt;password&gt;</span>
124+
</span><span id="init-18"><a href="#init-18"><span class="linenos">18</span></a><span class="sd"> ```</span>
125+
</span><span id="init-19"><a href="#init-19"><span class="linenos">19</span></a>
126+
</span><span id="init-20"><a href="#init-20"><span class="linenos">20</span></a><span class="sd"> Returns:</span>
127+
</span><span id="init-21"><a href="#init-21"><span class="linenos">21</span></a><span class="sd"> object: The authenticated Tapis object.</span>
128+
</span><span id="init-22"><a href="#init-22"><span class="linenos">22</span></a><span class="sd"> &quot;&quot;&quot;</span>
129+
</span><span id="init-23"><a href="#init-23"><span class="linenos">23</span></a> <span class="n">base_url</span> <span class="o">=</span> <span class="s2">&quot;https://designsafe.tapis.io&quot;</span>
130+
</span><span id="init-24"><a href="#init-24"><span class="linenos">24</span></a>
131+
</span><span id="init-25"><a href="#init-25"><span class="linenos">25</span></a> <span class="c1"># Load environment variables from .env file</span>
132+
</span><span id="init-26"><a href="#init-26"><span class="linenos">26</span></a> <span class="n">load_dotenv</span><span class="p">()</span>
133+
</span><span id="init-27"><a href="#init-27"><span class="linenos">27</span></a>
134+
</span><span id="init-28"><a href="#init-28"><span class="linenos">28</span></a> <span class="c1"># Try to get credentials from environment variables</span>
135+
</span><span id="init-29"><a href="#init-29"><span class="linenos">29</span></a> <span class="n">username</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">getenv</span><span class="p">(</span><span class="s2">&quot;DESIGNSAFE_USERNAME&quot;</span><span class="p">)</span>
136+
</span><span id="init-30"><a href="#init-30"><span class="linenos">30</span></a> <span class="n">password</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">getenv</span><span class="p">(</span><span class="s2">&quot;DESIGNSAFE_PASSWORD&quot;</span><span class="p">)</span>
131137
</span><span id="init-31"><a href="#init-31"><span class="linenos">31</span></a>
132-
</span><span id="init-32"><a href="#init-32"><span class="linenos">32</span></a> <span class="c1"># Initialize Tapis object</span>
133-
</span><span id="init-33"><a href="#init-33"><span class="linenos">33</span></a> <span class="n">t</span> <span class="o">=</span> <span class="n">Tapis</span><span class="p">(</span><span class="n">base_url</span><span class="o">=</span><span class="n">base_url</span><span class="p">,</span> <span class="n">username</span><span class="o">=</span><span class="n">username</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="n">password</span><span class="p">)</span>
134-
</span><span id="init-34"><a href="#init-34"><span class="linenos">34</span></a>
135-
</span><span id="init-35"><a href="#init-35"><span class="linenos">35</span></a> <span class="n">t</span><span class="o">.</span><span class="n">get_tokens</span><span class="p">()</span>
136-
</span><span id="init-36"><a href="#init-36"><span class="linenos">36</span></a>
137-
</span><span id="init-37"><a href="#init-37"><span class="linenos">37</span></a> <span class="k">return</span> <span class="n">t</span>
138+
</span><span id="init-32"><a href="#init-32"><span class="linenos">32</span></a> <span class="c1"># If environment variables are not set, prompt user for input</span>
139+
</span><span id="init-33"><a href="#init-33"><span class="linenos">33</span></a> <span class="k">if</span> <span class="ow">not</span> <span class="n">username</span><span class="p">:</span>
140+
</span><span id="init-34"><a href="#init-34"><span class="linenos">34</span></a> <span class="n">username</span> <span class="o">=</span> <span class="nb">input</span><span class="p">(</span><span class="s2">&quot;Enter username: &quot;</span><span class="p">)</span>
141+
</span><span id="init-35"><a href="#init-35"><span class="linenos">35</span></a> <span class="k">if</span> <span class="ow">not</span> <span class="n">password</span><span class="p">:</span>
142+
</span><span id="init-36"><a href="#init-36"><span class="linenos">36</span></a> <span class="n">password</span> <span class="o">=</span> <span class="n">getpass</span><span class="p">(</span><span class="s2">&quot;Enter password: &quot;</span><span class="p">)</span>
143+
</span><span id="init-37"><a href="#init-37"><span class="linenos">37</span></a>
144+
</span><span id="init-38"><a href="#init-38"><span class="linenos">38</span></a> <span class="c1"># Initialize Tapis object</span>
145+
</span><span id="init-39"><a href="#init-39"><span class="linenos">39</span></a> <span class="n">t</span> <span class="o">=</span> <span class="n">Tapis</span><span class="p">(</span><span class="n">base_url</span><span class="o">=</span><span class="n">base_url</span><span class="p">,</span> <span class="n">username</span><span class="o">=</span><span class="n">username</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="n">password</span><span class="p">)</span>
146+
</span><span id="init-40"><a href="#init-40"><span class="linenos">40</span></a>
147+
</span><span id="init-41"><a href="#init-41"><span class="linenos">41</span></a> <span class="n">t</span><span class="o">.</span><span class="n">get_tokens</span><span class="p">()</span>
148+
</span><span id="init-42"><a href="#init-42"><span class="linenos">42</span></a>
149+
</span><span id="init-43"><a href="#init-43"><span class="linenos">43</span></a> <span class="k">return</span> <span class="n">t</span>
138150
</span></pre></div>
139151

140152

141153
<div class="docstring"><p>Initialize a Tapis object with authentication.
142154
Tries to read credentials from environment variables first.
143155
If not found, prompts the user for input.</p>
144156

157+
<p>Save the user credentials in the .env file.</p>
158+
159+
<pre><code>DESIGNSAFE_USERNAME=&lt;username&gt;
160+
DESIGNSAFE_PASSWORD=&lt;password&gt;
161+
</code></pre>
162+
145163
<p>Returns:
146164
object: The authenticated Tapis object.</p>
147165
</div>

0 commit comments

Comments
 (0)