Merge branch 'release/1.12.1'

djha-skin · Jan 25, 2018 · 93cef8f · 93cef8f
2 parents 4fb79b5 + 15532a3
commit 93cef8f
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 22 deletions.
diff --git a/TODO b/TODO
@@ -1,12 +1,8 @@
 - [ ] Docs: common pitfall of subproc: "name" vs "id" in json or
   strings vs keywords in EDN
-- [ ] Add plugin or backend / whatever repo thing command option
-- [ ] Fork process, get back information, parse it, use that as a map-repo. That's how
-      the plugins work.
-  - Do work on this for new plugin architecture
-- [ ] Deprecate backend in docs
-- [ ] Subcommand `search-repo`
-- [ ] Docs:
-  - [ ] Set Up Guide
-  - [ ] Use cases section
 - [ ] BOOT fix so that most of build is in it
+- [ ] 1.13 release: the http package system, allowing the query
+      per-package of some process (for e.g. helm purposes)
+- [ ] 1.13 release: remove-packages
+- [ ] 1.13 release: --state-file <save-state-here>
+- [ ] 1.13 release: tree print out
diff --git a/authors.rst b/authors.rst
@@ -0,0 +1 @@
+docs/authors.rst
diff --git a/AUTHORS.md → docs/authors.rst b/AUTHORS.md → docs/authors.rst
@@ -1,7 +1,12 @@
+Authors and Contributions
+=========================
+
 We thank everyone that has contributed to Degasolv!
 
-Authors:
+Authors
+-------
   - Daniel Jay Haskin
 
-Contributions:
+Contributions
+-------------
   - Logo contributed to Degasolv by James Toney
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -12,6 +12,36 @@ and this project adheres to `Semantic Versioning`_.
 .. _Keep a Changelog: http://keepachangelog.com/en/1.0.0/
 
 `Unreleased`_
+-------------
+
+Added
++++++
+
+Changed
++++++++
+
+Fixed
++++++
+
+
+`1.12.1`_
+---------
+
+*1.12.1 was strictly a docs release. No code changes were made and no runnable
+artifacts were created.*
+
+Added
++++++
+
+- Added authors file to docs
+
+Fixed
++++++
+
+- Fixed changelog so that the 1.12.0 release was present in the document
+- Fixed package system subheaders in command reference
+
+`1.12.0`_
 ---------
 
 Added
@@ -231,7 +261,9 @@ Added
 
 - This isn't the first release, but for the purposes of these docs, it is :D
 
-.. _Unreleased: https://github.com/djhaskin987/degasolv/compare/1.11.0...HEAD
+.. _Unreleased: https://github.com/djhaskin987/degasolv/compare/1.12.1...HEAD
+.. _1.12.1: https://github.com/djhaskin987/degasolv/compare/1.12.0...1.12.1
+.. _1.12.0: https://github.com/djhaskin987/degasolv/compare/1.11.0...1.12.0
 .. _1.11.0: https://github.com/djhaskin987/degasolv/compare/1.10.0...1.11.0
 .. _1.10.0: https://github.com/djhaskin987/degasolv/compare/1.9.0...1.10.0
 .. _1.9.0: https://github.com/djhaskin987/degasolv/compare/1.8.0...1.9.0

diff --git a/docs/command-reference.rst b/docs/command-reference.rst
@@ -1593,8 +1593,7 @@ command to behave normally.
 
 Other available values are shown below.
 
-The ``apt`` Package System
-__________________________
+**The "apt" Package System**
 
 **Experimental**. The ``apt`` package system resolves using the APT
 debian package manager.  When using this method, `specify
@@ -1629,8 +1628,7 @@ is ``any``.
 
 .. _subproc-pkgsys:
 
-The ``subproc`` Package System
-______________________________
+**The "subproc" Package System**
 
 The ``subproc`` package system allows the user to give Degasolv
 package information via a subprocess (shell-out) command. A path

diff --git a/docs/conf.py b/docs/conf.py
@@ -50,8 +50,8 @@
 
 # General information about the project.
 project = 'Degasolv'
-copyright = '2017, Daniel Jay Haskin et. al., see the AUTHORS.md file'
-author = 'Daniel Jay Haskin et. al., see the AUTHORS.md file'
+copyright = '2017-2018, Daniel Jay Haskin et. al., see all authors under "Authors and Contributions"'
+author = 'Daniel Jay Haskin et. al., see the authors under "Authors and Contributions"'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '1.12'
 # The full version, including alpha/beta/rc tags.
-release = '1.12.0'
+release = '1.12.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -34,8 +34,8 @@ whether or not it is likely to be accepted:
 4. **Did you add documentation around the feature in your PR?**
    Generally this at least means adding something to the :ref:`Command
    Reference` document.
-5. **Did you add an entry to the :ref:`Degasolv Changelog`?** This
-   project keeps a hand-crafted changelog.
+5. **Did you add an entry to the Changelog?** This project keeps a
+   curated :ref:`changelog <Degasolv Changelog>`.
 
 There are some exceptions to the above rules. If your patch is less than
 two lines' difference from the previous version, your PR may be a "typo" PR,

diff --git a/docs/index.rst b/docs/index.rst
@@ -26,6 +26,7 @@ Fork Degasolv on Github:
    Command Reference <command-reference>
    Code of Conduct <code-of-conduct>
    Contributing Guide <contributing>
+   Authors and Contributions <authors>
 
 Indices and tables
 ******************

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject degasolv/degasolv "1.12.0"
+(defproject degasolv/degasolv "1.12.1"
   :description "Dependency tracker with an eye toward building and shipping software."
   :url "http://github.com/djhaskin987/degasolv"
   :license {:name "Eclipse Public License"