Skip to content

Commit b9ee9f9

Browse files
klehman-rallyklehman-rally
committed
multi-condition query with subset/range clause(s) (#178)
* working on getting in and between query conditions working when there are other conditions * fixed multi condition query where subset and / or range condition(s) are involved * README and doco inclusion * generated stuff for 1.5.2 * final generated elements for this 1.5.2 release
1 parent 5bfe035 commit b9ee9f9

6 files changed

Lines changed: 40 additions & 273 deletions

File tree

‎doc/build/html/_static/documentation_options.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const DOCUMENTATION_OPTIONS = {
2-
VERSION: '1.6.0',
2+
VERSION: '1.7.0',
33
LANGUAGE: 'en',
44
COLLAPSE_INDEX: false,
55
BUILDER: 'html',
@@ -10,4 +10,4 @@ const DOCUMENTATION_OPTIONS = {
1010
NAVIGATION_WITH_KEYS: false,
1111
SHOW_SEARCH_SUMMARY: true,
1212
ENABLE_SEARCH_SHORTCUTS: true,
13-
};
13+
};

‎doc/build/html/genindex.html‎

Lines changed: 0 additions & 256 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,23 @@
11
<!DOCTYPE html>
22
<html class="writer-html5" lang="en" data-content_root="./">
33
<head>
4-
<<<<<<< HEAD
54
<meta charset="utf-8" />
65
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
76
<title>Index &mdash; pyral 1.6.0 documentation</title>
87
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
98
<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))
259

2610

2711
<!--[if lt IE 9]>
2812
<script src="_static/js/html5shiv.min.js"></script>
2913
<![endif]-->
3014

31-
<<<<<<< HEAD
3215
<script src="_static/documentation_options.js?v=72d88caf"></script>
3316
<script src="_static/doctools.js?v=888ff710"></script>
3417
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
3518
<script src="_static/js/theme.js"></script>
3619
<link rel="index" title="Index" href="#" />
3720
<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))
9321
</head>
9422

9523
<body class="wy-body-for-nav">
@@ -104,13 +32,7 @@
10432
pyral
10533
</a>
10634
<div class="version">
107-
<<<<<<< HEAD
10835
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))
11436
</div>
11537
<div role="search">
11638
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
@@ -119,33 +41,8 @@
11941
<input type="hidden" name="area" value="default" />
12042
</form>
12143
</div>
122-
<<<<<<< HEAD
12344
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
12445
<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))
14946
<li class="toctree-l1"><a class="reference internal" href="overview.html">Python toolkit for the Rally REST API</a></li>
15047
<li class="toctree-l1"><a class="reference internal" href="overview.html#simple-use">Simple Use</a></li>
15148
<li class="toctree-l1"><a class="reference internal" href="overview.html#rally-data-model">Rally Data Model</a></li>
@@ -168,97 +65,20 @@
16865
</div>
16966
</nav>
17067

171-
<<<<<<< HEAD
17268
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
17369
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
17470
<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))
19271
</nav>
19372

19473
<div class="wy-nav-content">
19574
<div class="rst-content">
196-
<<<<<<< HEAD
19775
<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))
23076
<ul class="wy-breadcrumbs">
231-
<<<<<<< HEAD
23277
<li><a href="index.html" class="icon icon-home" aria-label="Home"></a></li>
23378
<li class="breadcrumb-item active">Index</li>
23479
<li class="wy-breadcrumbs-aside">
23580
</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))
25981
</ul>
260-
261-
26282
<hr/>
26383
</div>
26484
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
@@ -446,29 +266,14 @@ <h2 id="U">U</h2>
446266

447267

448268

449-
</div>
450-
<div class="articleComments">
451-
452269
</div>
453270
</div>
454271
<footer>
455272

456273
<hr/>
457274

458275
<div role="contentinfo">
459-
<<<<<<< HEAD
460276
<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))
472277
</div>
473278

474279
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
@@ -481,68 +286,7 @@ <h2 id="U">U</h2>
481286
</div>
482287
</section>
483288
</div>
484-
<<<<<<< HEAD
485289
<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))
546290
jQuery(function () {
547291
SphinxRtdTheme.Navigation.enable(true);
548292
});

‎doc/build/html/pyral-1.4.2.docs.html.zip‎

874 KB
Binary file not shown.

‎doc/build/html/pyral-1.5.2.docs.html.zip‎

8.89 MB
Binary file not shown.

‎pyral/hydrate.py‎

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

12-
<<<<<<< HEAD
1312
__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))
1913

2014
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))
3015

3116
from .entity import classFor, getSchemaItem, addEntity, PortfolioItem, \
3217
VERSION_ATTRIBUTES, MINIMAL_ATTRIBUTES, PORTFOLIO_ITEM_SUB_TYPES

0 commit comments

Comments
 (0)