Skip to content

Commit 5bfe035

Browse files
klehman-rallypgacv2Jean-Francois ThuongvirtualsnakeKip Lehman
committed
mods for 1.5.0 from dev fork (#173)
* Hacktonia (#23) * put pyral-1.2.2.zip in dist subdir manually * Fixed KeyError in RallyRESTResponse.__repr__() Fixed RallyRESTResponse.__repr__() so it doesn't raise a KeyError on a response to a query that returned no results. * Corrected encoding function for getting Attachment to fix issue #138 * Fix issue with exception in case of ProfileImage field * fixed getting attachments, getting custom PI subtype instance on creation, purged AgileCentral refs in most places, upped version to 1.5.0 * more portfolio item sub-type mods, fixed query criteria having an ampersand in the target string, incorporated query result start index fix contributed by customer * upping version in docs * updating items mentioned in the release-guide-1.5.0 * post build_dist product inspection issues rectified * final mod before PR to master * minor fix to minimum requests package version Co-authored-by: pgacv2 <pgacv2@users.noreply.github.com> Co-authored-by: Jean-Francois Thuong <jfthuong@gmail.com> Co-authored-by: esokolov <sokol94inc@gmail.com> * added generated distributions for 1.5.0 release * yet more fine-tuning prior to release * has generated dist items from updated setup.py * deleted some more cruft * dropped all support for Python 2.7 * generated items again... * fixed long_description_content_type keyword * maybe fixed line 11 in README.rst * another maybe fix on line 11 in README.rst * yet another round of generated items Co-authored-by: pgacv2 <pgacv2@users.noreply.github.com> Co-authored-by: Jean-Francois Thuong <jfthuong@gmail.com> Co-authored-by: esokolov <sokol94inc@gmail.com> Co-authored-by: Kip Lehman <kipster.t@gmail.com>
1 parent 06fe765 commit 5bfe035

3 files changed

Lines changed: 309 additions & 0 deletions

File tree

‎doc/build/html/genindex.html‎

Lines changed: 256 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,95 @@
11
<!DOCTYPE html>
22
<html class="writer-html5" lang="en" data-content_root="./">
33
<head>
4+
<<<<<<< HEAD
45
<meta charset="utf-8" />
56
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
67
<title>Index &mdash; pyral 1.6.0 documentation</title>
78
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
89
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
10+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
11+
<meta charset="utf-8">
12+
13+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
14+
15+
<title>Index &mdash; pyral 1.4.2 documentation</title>
16+
17+
=======
18+
<meta charset="utf-8">
19+
20+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
21+
22+
<title>Index &mdash; pyral 1.5.0 documentation</title>
23+
24+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
925

1026

1127
<!--[if lt IE 9]>
1228
<script src="_static/js/html5shiv.min.js"></script>
1329
<![endif]-->
1430

31+
<<<<<<< HEAD
1532
<script src="_static/documentation_options.js?v=72d88caf"></script>
1633
<script src="_static/doctools.js?v=888ff710"></script>
1734
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
1835
<script src="_static/js/theme.js"></script>
1936
<link rel="index" title="Index" href="#" />
2037
<link rel="search" title="Search" href="search.html" />
38+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
39+
40+
41+
42+
43+
44+
45+
46+
47+
48+
49+
50+
<link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
51+
52+
53+
54+
55+
56+
<link rel="index" title="Index"
57+
href="#"/>
58+
<link rel="search" title="Search" href="search.html"/>
59+
<link rel="top" title="pyral 1.4.2 documentation" href="index.html"/>
60+
61+
62+
<script src="_static/js/modernizr.min.js"></script>
63+
64+
=======
65+
66+
67+
68+
69+
70+
71+
72+
73+
74+
75+
76+
77+
78+
<link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
79+
80+
81+
82+
83+
84+
<link rel="index" title="Index"
85+
href="#"/>
86+
<link rel="search" title="Search" href="search.html"/>
87+
<link rel="top" title="pyral 1.5.0 documentation" href="index.html"/>
88+
89+
90+
<script src="_static/js/modernizr.min.js"></script>
91+
92+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
2193
</head>
2294

2395
<body class="wy-body-for-nav">
@@ -32,7 +104,13 @@
32104
pyral
33105
</a>
34106
<div class="version">
107+
<<<<<<< HEAD
35108
1.6.0
109+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
110+
1.4.2
111+
=======
112+
1.5.0
113+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
36114
</div>
37115
<div role="search">
38116
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
@@ -41,8 +119,33 @@
41119
<input type="hidden" name="area" value="default" />
42120
</form>
43121
</div>
122+
<<<<<<< HEAD
44123
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
45124
<ul>
125+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
126+
127+
128+
</div>
129+
130+
<div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
131+
132+
133+
134+
<ul>
135+
=======
136+
137+
138+
</div>
139+
140+
<div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
141+
142+
143+
144+
145+
146+
147+
<ul>
148+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
46149
<li class="toctree-l1"><a class="reference internal" href="overview.html">Python toolkit for the Rally REST API</a></li>
47150
<li class="toctree-l1"><a class="reference internal" href="overview.html#simple-use">Simple Use</a></li>
48151
<li class="toctree-l1"><a class="reference internal" href="overview.html#rally-data-model">Rally Data Model</a></li>
@@ -65,20 +168,97 @@
65168
</div>
66169
</nav>
67170

171+
<<<<<<< HEAD
68172
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
69173
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
70174
<a href="index.html">pyral</a>
175+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
176+
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
177+
178+
179+
<nav class="wy-nav-top" role="navigation" aria-label="top navigation">
180+
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
181+
<a href="index.html">pyral</a>
182+
=======
183+
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
184+
185+
186+
<nav class="wy-nav-top" role="navigation" aria-label="top navigation">
187+
188+
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
189+
<a href="index.html">pyral</a>
190+
191+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
71192
</nav>
72193

73194
<div class="wy-nav-content">
74195
<div class="rst-content">
196+
<<<<<<< HEAD
75197
<div role="navigation" aria-label="Page navigation">
198+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
199+
200+
201+
202+
203+
204+
205+
206+
207+
208+
209+
<div role="navigation" aria-label="breadcrumbs navigation">
210+
=======
211+
212+
213+
214+
215+
216+
217+
218+
219+
220+
221+
222+
223+
224+
225+
226+
227+
<div role="navigation" aria-label="breadcrumbs navigation">
228+
229+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
76230
<ul class="wy-breadcrumbs">
231+
<<<<<<< HEAD
77232
<li><a href="index.html" class="icon icon-home" aria-label="Home"></a></li>
78233
<li class="breadcrumb-item active">Index</li>
79234
<li class="wy-breadcrumbs-aside">
80235
</li>
236+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
237+
<li><a href="index.html">Docs</a> &raquo;</li>
238+
239+
<li>Index</li>
240+
<li class="wy-breadcrumbs-aside">
241+
242+
243+
244+
</li>
245+
=======
246+
247+
<li><a href="index.html">Docs</a> &raquo;</li>
248+
249+
<li>Index</li>
250+
251+
252+
<li class="wy-breadcrumbs-aside">
253+
254+
255+
256+
</li>
257+
258+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
81259
</ul>
260+
261+
82262
<hr/>
83263
</div>
84264
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
@@ -266,14 +446,29 @@ <h2 id="U">U</h2>
266446

267447

268448

449+
</div>
450+
<div class="articleComments">
451+
269452
</div>
270453
</div>
271454
<footer>
272455

273456
<hr/>
274457

275458
<div role="contentinfo">
459+
<<<<<<< HEAD
276460
<p>&#169; Copyright Broadcom 2018-2024, CA Technologies 2015-2017, Rally Software Development 2010-2015.</p>
461+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
462+
<p>
463+
&copy; Copyright CA Technologies 2015-2017, Rally Software Development 2010-2015.
464+
465+
</p>
466+
=======
467+
<p>
468+
&copy; Copyright Broadcom 2018-2021, CA Technologies 2015-2017, Rally Software Development 2010-2015.
469+
470+
</p>
471+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
277472
</div>
278473

279474
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
@@ -286,7 +481,68 @@ <h2 id="U">U</h2>
286481
</div>
287482
</section>
288483
</div>
484+
<<<<<<< HEAD
289485
<script>
486+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
487+
488+
489+
490+
491+
492+
<script type="text/javascript">
493+
var DOCUMENTATION_OPTIONS = {
494+
URL_ROOT:'./',
495+
VERSION:'1.4.2',
496+
COLLAPSE_INDEX:false,
497+
FILE_SUFFIX:'.html',
498+
HAS_SOURCE: true
499+
};
500+
</script>
501+
<script type="text/javascript" src="_static/jquery.js"></script>
502+
<script type="text/javascript" src="_static/underscore.js"></script>
503+
<script type="text/javascript" src="_static/doctools.js"></script>
504+
505+
506+
507+
508+
509+
<script type="text/javascript" src="_static/js/theme.js"></script>
510+
511+
512+
513+
514+
<script type="text/javascript">
515+
=======
516+
517+
518+
519+
520+
521+
<script type="text/javascript">
522+
var DOCUMENTATION_OPTIONS = {
523+
URL_ROOT:'./',
524+
VERSION:'1.5.0',
525+
COLLAPSE_INDEX:false,
526+
FILE_SUFFIX:'.html',
527+
HAS_SOURCE: true,
528+
SOURCELINK_SUFFIX: ''
529+
};
530+
</script>
531+
<script type="text/javascript" src="_static/jquery.js"></script>
532+
<script type="text/javascript" src="_static/underscore.js"></script>
533+
<script type="text/javascript" src="_static/doctools.js"></script>
534+
535+
536+
537+
538+
539+
<script type="text/javascript" src="_static/js/theme.js"></script>
540+
541+
542+
543+
544+
<script type="text/javascript">
545+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
290546
jQuery(function () {
291547
SphinxRtdTheme.Navigation.enable(true);
292548
});

‎pyral/hydrate.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,24 @@
99
#
1010
###################################################################################################
1111

12+
<<<<<<< HEAD
1213
__version__ = (1, 7, 0)
14+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
15+
__version__ = (1, 4, 2)
16+
=======
17+
__version__ = (1, 5, 0)
18+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
1319

1420
import sys
21+
<<<<<<< HEAD
22+
||||||| parent of 36ca7ed (mods for 1.5.0 from dev fork (#173))
23+
import imp
24+
imp.reload(sys) # Reload gets a sys module that has the setdefaultencoding before site.py deletes it
25+
import six
26+
six.PY2 and sys.setdefaultencoding('UTF8') # not required in python 3
27+
=======
28+
import six
29+
>>>>>>> 36ca7ed (mods for 1.5.0 from dev fork (#173))
1530

1631
from .entity import classFor, getSchemaItem, addEntity, PortfolioItem, \
1732
VERSION_ATTRIBUTES, MINIMAL_ATTRIBUTES, PORTFOLIO_ITEM_SUB_TYPES

0 commit comments

Comments
 (0)