Skip to content

Commit

Permalink
Merge pull request #181 from Unidata/v1.2.0rel
Browse files Browse the repository at this point in the history
readying 1.2.0 release
  • Loading branch information
jswhit committed Jul 5, 2020
2 parents db66129 + c7eee86 commit 270f50f
Show file tree
Hide file tree
Showing 22 changed files with 484 additions and 384 deletions.
4 changes: 2 additions & 2 deletions Changelog
@@ -1,5 +1,5 @@
version 1.2.0 (not yet released)
================================
version 1.2.0 (release tag v1.2.0rel)
=====================================
* Return the default values of dayofwk and dayofyr when calendar
is '' (issue #173).
* fix treatment of masked arrays in num2date and date2num (issue #175).
Expand Down
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -12,6 +12,8 @@ Time-handling functionality from netcdf4-python
## News
For details on the latest updates, see the [Changelog](https://github.com/Unidata/cftime/blob/master/Changelog).

7/06/2020: version 1.2.0 released. New microsecond accurate algorithm for date2num/num2date contributed by @spencerkclark. Bugs fixed in masked array handling.

5/12/2020: version 1.1.3 released. Add isoformat method for compatibility with python datetime (issue #152).
Make 'standard' default calendar for cftime.datetime so that dayofwk,dayofyr methods don't fail (issue #169).

Expand Down
Binary file modified docs/_build/doctrees/api.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/_build/doctrees/index.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/installing.doctree
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/_build/html/.buildinfo
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: f84fed7cc3841bb85e202f7b3dd39189
config: 2629b59f89353a6a3eea208d9d747f2a
tags: 645f666f9bcd5a90fca523b33c5a78b7
2 changes: 1 addition & 1 deletion docs/_build/html/_sources/installing.rst.txt
Expand Up @@ -4,7 +4,7 @@ Installation
Required dependencies
---------------------

- Python 2.7, 3.4, 3.5, or 3.6
- Python: >3.2
- `numpy <http://www.numpy.org/>`__ (1.7 or later)


Expand Down
15 changes: 1 addition & 14 deletions docs/_build/html/_static/alabaster.css
Expand Up @@ -166,19 +166,6 @@ div.sphinxsidebar hr {
width: 50%;
}

div.sphinxsidebar .badge {
border-bottom: none;
}

div.sphinxsidebar .badge:hover {
border-bottom: none;
}

/* To address an issue with donation coming after search */
div.sphinxsidebar h3.donation {
margin-top: 10px;
}

/* -- body styles ----------------------------------------------------------- */

a {
Expand Down Expand Up @@ -327,7 +314,7 @@ p.admonition-title:after {
}

pre, tt, code {
font-family: 'Consolas', 'Menlo', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
font-size: 0.9em;
}

Expand Down
103 changes: 2 additions & 101 deletions docs/_build/html/_static/basic.css
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
* :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -81,10 +81,6 @@ div.sphinxsidebar input {
font-size: 1em;
}

div.sphinxsidebar #searchbox form.search {
overflow: hidden;
}

div.sphinxsidebar #searchbox input[type="text"] {
float: left;
width: 80%;
Expand Down Expand Up @@ -231,16 +227,6 @@ a.headerlink {
visibility: hidden;
}

a.brackets:before,
span.brackets > a:before{
content: "[";
}

a.brackets:after,
span.brackets > a:after {
content: "]";
}

h1:hover > a.headerlink,
h2:hover > a.headerlink,
h3:hover > a.headerlink,
Expand Down Expand Up @@ -289,12 +275,6 @@ img.align-center, .figure.align-center, object.align-center {
margin-right: auto;
}

img.align-default, .figure.align-default {
display: block;
margin-left: auto;
margin-right: auto;
}

.align-left {
text-align: left;
}
Expand All @@ -303,10 +283,6 @@ img.align-default, .figure.align-default {
text-align: center;
}

.align-default {
text-align: center;
}

.align-right {
text-align: right;
}
Expand Down Expand Up @@ -378,11 +354,6 @@ table.align-center {
margin-right: auto;
}

table.align-default {
margin-left: auto;
margin-right: auto;
}

table caption span.caption-number {
font-style: italic;
}
Expand Down Expand Up @@ -416,16 +387,6 @@ table.citation td {
border-bottom: none;
}

th > p:first-child,
td > p:first-child {
margin-top: 0px;
}

th > p:last-child,
td > p:last-child {
margin-bottom: 0px;
}

/* -- figures --------------------------------------------------------------- */

div.figure {
Expand Down Expand Up @@ -466,13 +427,6 @@ table.field-list td, table.field-list th {
hyphens: manual;
}

/* -- hlist styles ---------------------------------------------------------- */

table.hlist td {
vertical-align: top;
}


/* -- other body styles ----------------------------------------------------- */

ol.arabic {
Expand All @@ -495,58 +449,11 @@ ol.upperroman {
list-style: upper-roman;
}

li > p:first-child {
margin-top: 0px;
}

li > p:last-child {
margin-bottom: 0px;
}

dl.footnote > dt,
dl.citation > dt {
float: left;
}

dl.footnote > dd,
dl.citation > dd {
margin-bottom: 0em;
}

dl.footnote > dd:after,
dl.citation > dd:after {
content: "";
clear: both;
}

dl.field-list {
display: grid;
grid-template-columns: fit-content(30%) auto;
}

dl.field-list > dt {
font-weight: bold;
word-break: break-word;
padding-left: 0.5em;
padding-right: 5px;
}

dl.field-list > dt:after {
content: ":";
}

dl.field-list > dd {
padding-left: 0.5em;
margin-top: 0em;
margin-left: 0em;
margin-bottom: 0em;
}

dl {
margin-bottom: 15px;
}

dd > p:first-child {
dd p {
margin-top: 0px;
}

Expand Down Expand Up @@ -619,12 +526,6 @@ dl.glossary dt {
font-style: oblique;
}

.classifier:before {
font-style: normal;
margin: 0.5em;
content: ":";
}

abbr, acronym {
border-bottom: dotted 1px;
cursor: help;
Expand Down
13 changes: 6 additions & 7 deletions docs/_build/html/_static/doctools.js
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for all documentation.
*
* :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -87,13 +87,14 @@ jQuery.fn.highlightText = function(text, className) {
node.nextSibling));
node.nodeValue = val.substr(0, pos);
if (isInSVG) {
var bbox = span.getBBox();
var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
var bbox = node.parentElement.getBBox();
rect.x.baseVal.value = bbox.x;
rect.x.baseVal.value = bbox.x;
rect.y.baseVal.value = bbox.y;
rect.width.baseVal.value = bbox.width;
rect.height.baseVal.value = bbox.height;
rect.setAttribute('class', className);
var parentOfText = node.parentNode.parentNode;
addItems.push({
"parent": node.parentNode,
"target": rect});
Expand Down Expand Up @@ -149,9 +150,7 @@ var Documentation = {
this.fixFirefoxAnchorBug();
this.highlightSearchWords();
this.initIndexTable();
if (DOCUMENTATION_OPTIONS.NAVIGATION_WITH_KEYS) {
this.initOnKeyListeners();
}

},

/**
Expand Down Expand Up @@ -311,4 +310,4 @@ _ = Documentation.gettext;

$(document).ready(function() {
Documentation.init();
});
});
3 changes: 1 addition & 2 deletions docs/_build/html/_static/documentation_options.js
Expand Up @@ -5,6 +5,5 @@ var DOCUMENTATION_OPTIONS = {
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true,
SOURCELINK_SUFFIX: '.txt',
NAVIGATION_WITH_KEYS: false
SOURCELINK_SUFFIX: '.txt'
};
6 changes: 4 additions & 2 deletions docs/_build/html/_static/jquery.js

Large diffs are not rendered by default.

0 comments on commit 270f50f

Please sign in to comment.