Skip to content

Commit

Permalink
Added collection version to title; Added dev suffix to version
Browse files Browse the repository at this point in the history
Details:

* Added the full version of the collection to its title.

* Added support in the version parsing function in setup.py and
  in conf.py to accept preliminary versions according to the
  syntax defined by semver 2.0 which is allowed by Ansible,
  e.g. 1.0.0-dev1. This included monkey-patching the function
  that normalizes the version so it accepts semver compatible
  dev suffixes as required by Ansible.

* Adjusted the instructions for releasing a version and for
  starting a new version in the development section of the docs
  to support development version suffixes.

* Changed the version back to 1.0.0-dev1.

Signed-off-by: Andreas Maier <maiera@de.ibm.com>
  • Loading branch information
andy-maier committed Nov 13, 2020
1 parent a05b164 commit ac93916
Show file tree
Hide file tree
Showing 29 changed files with 125 additions and 103 deletions.
6 changes: 3 additions & 3 deletions docs/CONTRIBUTING.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Contributing &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>Contributing &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -51,7 +51,7 @@



<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -107,7 +107,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">ibm.zhmc Ansible Galaxy collection</a>
<a href="index.html">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down
2 changes: 1 addition & 1 deletion docs/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '1.0.0',
VERSION: '1.0.0-dev1',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
6 changes: 3 additions & 3 deletions docs/all_modules.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>All modules &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>All modules &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -51,7 +51,7 @@



<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -117,7 +117,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">ibm.zhmc Ansible Galaxy collection</a>
<a href="index.html">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down
6 changes: 3 additions & 3 deletions docs/appendix.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Appendix &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>Appendix &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -51,7 +51,7 @@



<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -111,7 +111,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">ibm.zhmc Ansible Galaxy collection</a>
<a href="index.html">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down
10 changes: 5 additions & 5 deletions docs/changes.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Change log &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>Change log &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -50,7 +50,7 @@



<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -88,7 +88,7 @@
<li class="toctree-l1"><a class="reference internal" href="CONTRIBUTING.html">Contributing</a></li>
<li class="toctree-l1"><a class="reference internal" href="appendix.html">Appendix</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">Change log</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#version-1-0-0-dev1">Version 1.0.0.dev1</a></li>
<li class="toctree-l2"><a class="reference internal" href="#version-1-0-0-dev1">Version 1.0.0-dev1</a></li>
<li class="toctree-l2"><a class="reference internal" href="#version-0-8-0">Version 0.8.0</a></li>
<li class="toctree-l2"><a class="reference internal" href="#version-0-7-0">Version 0.7.0</a></li>
<li class="toctree-l2"><a class="reference internal" href="#version-0-6-0">Version 0.6.0</a></li>
Expand All @@ -113,7 +113,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">ibm.zhmc Ansible Galaxy collection</a>
<a href="index.html">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down Expand Up @@ -164,7 +164,7 @@
<div class="section" id="change-log">
<span id="id1"></span><h1>Change log<a class="headerlink" href="#change-log" title="Permalink to this headline"></a></h1>
<div class="section" id="version-1-0-0-dev1">
<h2>Version 1.0.0.dev1<a class="headerlink" href="#version-1-0-0-dev1" title="Permalink to this headline"></a></h2>
<h2>Version 1.0.0-dev1<a class="headerlink" href="#version-1-0-0-dev1" title="Permalink to this headline"></a></h2>
<p>This version contains all fixes up to version 0.8.x.</p>
<p>Released: not yet</p>
<p><strong>Incompatible changes:</strong></p>
Expand Down
18 changes: 10 additions & 8 deletions docs/development.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Development &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>Development &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -51,7 +51,7 @@



<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -112,7 +112,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">ibm.zhmc Ansible Galaxy collection</a>
<a href="index.html">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down Expand Up @@ -284,12 +284,10 @@
<div class="highlight-text notranslate"><div class="highlight"><pre><span></span>vi galaxy.yml
</pre></div>
</div>
<p>and verify that the version is set to the version to be released:</p>
<p>and set the version’ parameter to the version to be released:</p>
<div class="highlight-text notranslate"><div class="highlight"><pre><span></span>version: M.N.U
</pre></div>
</div>
<p>Note: The version in galaxy.yml cannot have a suffix of “.devX”, so it
should already have had the version to be released.</p>
</li>
<li><p>Commit your changes and push them upstream:</p>
<div class="highlight-text notranslate"><div class="highlight"><pre><span></span>git add docs_source/changes.rst
Expand Down Expand Up @@ -456,10 +454,14 @@
<div class="highlight-text notranslate"><div class="highlight"><pre><span></span>vi galaxy.yml
</pre></div>
</div>
<p>and update the version to the new version:</p>
<div class="highlight-text notranslate"><div class="highlight"><pre><span></span>version: M.N.U
<p>and update the version to the new version plus ‘-dev1’ to indicate it is in
development:</p>
<div class="highlight-text notranslate"><div class="highlight"><pre><span></span>version: M.N.U-dev1
</pre></div>
</div>
<p>Note: The version must follow the rules for semantic versioning 2.0 including
the description of development/alpha/etc suffixes, as described in
<a class="reference external" href="https://semver.org/">https://semver.org/</a></p>
</li>
<li><p>Commit your changes and push them upstream:</p>
<div class="highlight-text notranslate"><div class="highlight"><pre><span></span>git add docs/changes.rst
Expand Down
6 changes: 3 additions & 3 deletions docs/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Index &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>Index &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -49,7 +49,7 @@



<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -102,7 +102,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">ibm.zhmc Ansible Galaxy collection</a>
<a href="index.html">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down
14 changes: 7 additions & 7 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>ibm.zhmc Ansible Galaxy collection &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -50,7 +50,7 @@



<a href="#" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="#" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -103,7 +103,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="#">ibm.zhmc Ansible Galaxy collection</a>
<a href="#">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down Expand Up @@ -134,7 +134,7 @@

<li><a href="#" class="icon icon-home"></a> &raquo;</li>

<li>ibm.zhmc Ansible Galaxy collection</li>
<li>ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</li>


<li class="wy-breadcrumbs-aside">
Expand All @@ -151,8 +151,8 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">

<div class="section" id="ibm-zhmc-ansible-galaxy-collection">
<h1>ibm.zhmc Ansible Galaxy collection<a class="headerlink" href="#ibm-zhmc-ansible-galaxy-collection" title="Permalink to this headline"></a></h1>
<div class="section" id="ibm-zhmc-ansible-galaxy-collection-release">
<h1>ibm.zhmc Ansible Galaxy collection 1.0.0-dev1<a class="headerlink" href="#ibm-zhmc-ansible-galaxy-collection-release" title="Permalink to this headline"></a></h1>
<div class="toctree-wrapper compound" id="mastertoc">
<ul>
<li class="toctree-l1"><a class="reference internal" href="intro.html">Introduction</a><ul>
Expand Down Expand Up @@ -203,7 +203,7 @@ <h1>ibm.zhmc Ansible Galaxy collection<a class="headerlink" href="#ibm-zhmc-ansi
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="changes.html">Change log</a><ul>
<li class="toctree-l2"><a class="reference internal" href="changes.html#version-1-0-0-dev1">Version 1.0.0.dev1</a></li>
<li class="toctree-l2"><a class="reference internal" href="changes.html#version-1-0-0-dev1">Version 1.0.0-dev1</a></li>
<li class="toctree-l2"><a class="reference internal" href="changes.html#version-0-8-0">Version 0.8.0</a></li>
<li class="toctree-l2"><a class="reference internal" href="changes.html#version-0-7-0">Version 0.7.0</a></li>
<li class="toctree-l2"><a class="reference internal" href="changes.html#version-0-6-0">Version 0.6.0</a></li>
Expand Down
12 changes: 6 additions & 6 deletions docs/intro.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Introduction &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>Introduction &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -37,7 +37,7 @@
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
<link rel="next" title="All modules" href="all_modules.html" />
<link rel="prev" title="ibm.zhmc Ansible Galaxy collection" href="index.html" />
<link rel="prev" title="ibm.zhmc Ansible Galaxy collection 1.0.0-dev1" href="index.html" />
</head>

<body class="wy-body-for-nav">
Expand All @@ -51,7 +51,7 @@



<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -120,7 +120,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">ibm.zhmc Ansible Galaxy collection</a>
<a href="index.html">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down Expand Up @@ -467,7 +467,7 @@ <h3>Verification of the installation<a class="headerlink" href="#verification-of
</div>
<div class="section" id="versioning">
<span id="id6"></span><h2>Versioning<a class="headerlink" href="#versioning" title="Permalink to this headline"></a></h2>
<p>This documentation applies to version 1.0.0 of the ibm.zhmc
<p>This documentation applies to version 1.0.0-dev1 of the ibm.zhmc
Ansible Galaxy collection.</p>
<p>This collection uses the rules of <a class="reference external" href="http://semver.org/spec/v2.0.0.html">Semantic Versioning 2.0.0</a> for its version.</p>
<p>This documentation may have been built from a development level of the
Expand Down Expand Up @@ -517,7 +517,7 @@ <h3>Verification of the installation<a class="headerlink" href="#verification-of
<a href="all_modules.html" class="btn btn-neutral float-right" title="All modules" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>


<a href="index.html" class="btn btn-neutral float-left" title="ibm.zhmc Ansible Galaxy collection" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
<a href="index.html" class="btn btn-neutral float-left" title="ibm.zhmc Ansible Galaxy collection 1.0.0-dev1" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>

</div>

Expand Down
6 changes: 3 additions & 3 deletions docs/modules/zhmc_adapter.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>zhmc_adapter – Manages adapters of Z systems. &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>zhmc_adapter – Manages adapters of Z systems. &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -51,7 +51,7 @@



<a href="../index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="../index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -128,7 +128,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="../index.html">ibm.zhmc Ansible Galaxy collection</a>
<a href="../index.html">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down
6 changes: 3 additions & 3 deletions docs/modules/zhmc_cpc.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>zhmc_cpc – Manages Z systems at the system level. &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0 documentation</title>
<title>zhmc_cpc – Manages Z systems at the system level. &mdash; ibm.zhmc Ansible Galaxy collection 1.0.0-dev1 1.0.0-dev1 documentation</title>



Expand Down Expand Up @@ -51,7 +51,7 @@



<a href="../index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection
<a href="../index.html" class="icon icon-home" alt="Documentation Home"> ibm.zhmc Ansible Galaxy collection 1.0.0-dev1



Expand Down Expand Up @@ -128,7 +128,7 @@
<nav class="wy-nav-top" aria-label="top navigation">

<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="../index.html">ibm.zhmc Ansible Galaxy collection</a>
<a href="../index.html">ibm.zhmc Ansible Galaxy collection 1.0.0-dev1</a>

</nav>

Expand Down
Loading

0 comments on commit ac93916

Please sign in to comment.