diff options
| -rw-r--r-- | CHANGELOG.rst | 115 | ||||
| -rw-r--r-- | CHANGELOG.txt | 92 | ||||
| -rw-r--r-- | Pipfile | 6 | ||||
| -rw-r--r-- | Pipfile.lock | 161 | ||||
| -rw-r--r-- | README.rst | 7 | ||||
| -rw-r--r-- | TODO.txt | 2 | ||||
| -rw-r--r-- | docs/docutils.conf | 2 | ||||
| -rw-r--r-- | docs/source/conf.py | 10 | ||||
| -rw-r--r-- | docs/source/index.rst | 5 | ||||
| -rw-r--r-- | docs/source/robots.txt | 4 | ||||
| -rw-r--r-- | nncli/__init__.py | 2 | ||||
| -rw-r--r-- | nncli/config.py | 2 | ||||
| -rw-r--r-- | nncli/gui.py | 3 | ||||
| -rw-r--r-- | tox.ini | 2 |
14 files changed, 211 insertions, 202 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst deleted file mode 100644 index eaba6e5..0000000 --- a/CHANGELOG.rst +++ /dev/null @@ -1,115 +0,0 @@ -Changelog -========= - -All notable changes to this project will be documented in this file. - -The format is based on `Keep a Changelog`_ , and this project adheres to -`Semantic Versioning`_. - -Unreleased_ ------------ - -Added -~~~~~ - -- ``CHANGELOG.rst`` - -- ``TODO.txt`` - -- ``clear_ids.py`` contrib script - -Changed -~~~~~~~ - -- References to Github repo changed to point to git.danielmoch.com - (Github is now a mirror only) - -- Fixed exception in ``nncli sync`` - -v0.3.1_ – 2018-10-30 --------------------- - -Added -~~~~~ - -- Partial unit testing for ``nncli.py`` module - -Changed -~~~~~~~ - -- Refactored code (addressing pylint findings) - -- Fixed bad exception handling in Python 3.4 - -Removed -~~~~~~~ - -v0.3.0_ – 2018-09-07 --------------------- - -Added -~~~~~ - -- Documentation as PDF format - -Changed -~~~~~~~ - -- Numerous documentation corrections - -v0.2.0_ – 2018-09-03 --------------------- - -Added -~~~~~ - -- ``.travis.yml`` - -- Pytest, tox, et all added to support automated testing - -- Both tox and Travis testing back to Python 3.4 - -v0.1.2_ – 2018-08-30 --------------------- - -Added -~~~~~ - -- Support for ``--version`` flag - -Changed -~~~~~~~ - -- requirements.txt replaced with Pipfile{,.lock} - -v0.1.1_ – 2018-08-07 --------------------- - -Added -~~~~~ - -- README content included in PyPI - -Changed -~~~~~~~ - -- README content and formatting - -- Fix ``nncli import`` command - -v0.1.0 – 2018-07-31 -------------------- - -Added -~~~~~ - -- Hard fork of sncli - -.. _Keep a Changelog: https://keepachangelog.com/en/1.0.0/ -.. _Semantic Versioning: https://semver.org/spec/v2.0.0.html -.. _Unreleased: https://git.danielmoch.com/nncli.git/diff/?id=master&id2=v0.3.1 -.. _v0.3.1: https://git.danielmoch.com/nncli.git/diff/?id=v0.3.1&id2=v0.3.0 -.. _v0.3.0: https://git.danielmoch.com/nncli.git/diff/?id=v0.3.0&id2=v0.2.0 -.. _v0.2.0: https://git.danielmoch.com/nncli.git/diff/?id=v0.2.0&id2=v0.1.2 -.. _v0.1.2: https://git.danielmoch.com/nncli.git/diff/?id=v0.1.2&id2=v0.1.1 -.. _v0.1.1: https://git.danielmoch.com/nncli.git/diff/?id=v0.1.1&id2=v0.1.0 diff --git a/CHANGELOG.txt b/CHANGELOG.txt new file mode 100644 index 0000000..e274af0 --- /dev/null +++ b/CHANGELOG.txt @@ -0,0 +1,92 @@ +Changelog +========= + +All notable changes to this project will be documented in this file. + +The format is based on Keep a Changelog [1] , and this project adheres to +Semantic Versioning [2]. + +Unreleased [3] +---------- + +v0.3.3 - 2019-02-25 [4] +------------------- +Added +- Documentation + - TODO and CHANGELOG formatting + - docutils.conf + - sitemap + - Canonical URL + - robots.txt + +Changed +- Changed SafeConfigParser to ConfigParser +- Reversed test logic in _log_timeout to avoid popping off on an empty + stack. This bug was leading to fatal crashes. + +v0.3.2 – 2018-12-01 [5] +------------------- +Added + - CHANGELOG.rst + - TODO.txt + - clear_ids.py contrib script + +Changed +- References to Github repo changed to point to git.danielmoch.com +- Fixed exception in nncli sync + +v0.3.1 – 2018-10-30 [6] +------------------- +Added +- Partial unit testing for nncli.py module + +Changed +- Refactored code (addressing pylint findings) +- Fixed bad exception handling in Python 3.4 + +v0.3.0 – 2018-09-07 [7] +------------------- +Added +- Documentation as PDF format + +Changed +- Numerous documentation corrections + +v0.2.0 – 2018-09-03 [8] +------------------- +Added +- .travis.yml +- Pytest, tox, et all added to support automated testing +- Both tox and Travis testing back to Python 3.4 + +v0.1.2 – 2018-08-30 [9] +------------------- +Added +- Support for --version flag + +Changed +- requirements.txt replaced with Pipfile{,.lock} + +v0.1.1 – 2018-08-07 [10] +------------------- +Added +- README content included in PyPI + +Changed +- README content and formatting +- Fix nncli import command + +v0.1.0 – 2018-07-31 +------------------- +- Hard fork of sncli + +[1] - https://keepachangelog.com/en/1.0.0/ +[2] - https://semver.org/spec/v2.0.0.html +[3] - https://git.danielmoch.com/nncli/diff/?id=master&id2=v0.3.3 +[4] - https://git.danielmoch.com/nncli/diff/?id=v0.3.3&id2=v0.3.2 +[5] - https://git.danielmoch.com/nncli/diff/?id=v0.3.2&id2=v0.3.1 +[6] - https://git.danielmoch.com/nncli/diff/?id=v0.3.1&id2=v0.3.0 +[7] - https://git.danielmoch.com/nncli/diff/?id=v0.3.0&id2=v0.2.0 +[8] - https://git.danielmoch.com/nncli/diff/?id=v0.2.0&id2=v0.1.2 +[9] - https://git.danielmoch.com/nncli/diff/?id=v0.1.2&id2=v0.1.1 +[10] - https://git.danielmoch.com/nncli/diff/?id=v0.1.1&id2=v0.1.0 @@ -20,6 +20,8 @@ flit = "*" setuptools = "*" mock = "*" tox = "*" -pathlib2 = {version = "*", markers = "python_version < '3.5'"} -scandir = {version = "*", markers = "python_version < '3.5'"} +pathlib2 = {version = "*",markers = "python_version < '3.5'"} +scandir = {version = "*",markers = "python_version < '3.5'"} vulture = "*" +sphinx-rtd-theme = "*" +sphinx-sitemap = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 3e589e4..ed81c0f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "44a70f798cfaf69e97a5d6d1dfc9d4e7f19feb48ae8f32cbe55b2d34f3083731" + "sha256": "f2d2dd469e274b9440311cf31d3b05842d369787ee865fe20666b43e06cdd839" }, "pipfile-spec": 6, "requires": {}, @@ -24,10 +24,10 @@ }, "certifi": { "hashes": [ - "sha256:339dc09518b07e2fa7eda5450740925974815557727d6bd35d319c1524a04a4c", - "sha256:6d58c986d22b038c8c0df30d639f23a3e6d172a05c3583e766f4c0b785c0986a" + "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7", + "sha256:993f830721089fef441cdfeb4b2c8c9df86f0c63239f06bd025a76a7daddb033" ], - "version": "==2018.10.15" + "version": "==2018.11.29" }, "chardet": { "hashes": [ @@ -46,18 +46,18 @@ }, "idna": { "hashes": [ - "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e", - "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" ], - "version": "==2.7" + "version": "==2.8" }, "requests": { "hashes": [ - "sha256:65b3a120e4329e33c9889db89c80976c5272f56ea92d3e74da8a463992e3ff54", - "sha256:ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263" + "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", + "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" ], "index": "pypi", - "version": "==2.20.1" + "version": "==2.21.0" }, "urllib3": { "hashes": [ @@ -91,10 +91,10 @@ }, "atomicwrites": { "hashes": [ - "sha256:0312ad34fcad8fac3704d441f7b317e50af620823353ec657a53e981f92920c0", - "sha256:ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee" + "sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4", + "sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" ], - "version": "==1.2.1" + "version": "==1.3.0" }, "attrs": { "hashes": [ @@ -112,10 +112,10 @@ }, "certifi": { "hashes": [ - "sha256:339dc09518b07e2fa7eda5450740925974815557727d6bd35d319c1524a04a4c", - "sha256:6d58c986d22b038c8c0df30d639f23a3e6d172a05c3583e766f4c0b785c0986a" + "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7", + "sha256:993f830721089fef441cdfeb4b2c8c9df86f0c63239f06bd025a76a7daddb033" ], - "version": "==2018.10.15" + "version": "==2018.11.29" }, "chardet": { "hashes": [ @@ -177,18 +177,18 @@ }, "flit": { "hashes": [ - "sha256:6aefa6ff89a993af7a7af40d3df3d0387d6663df99797981ec41b1431ec6d1e1", - "sha256:9969db9708305b64fd8acf20043fcff144f910222397a221fd29871f02ed4a6f" + "sha256:1d93f7a833ed8a6e120ddc40db5c4763bc39bccc75c05081ec8285ece718aefb", + "sha256:6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36" ], "index": "pypi", - "version": "==1.2.1" + "version": "==1.3" }, "idna": { "hashes": [ - "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e", - "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" ], - "version": "==2.7" + "version": "==2.8" }, "imagesize": { "hashes": [ @@ -296,41 +296,41 @@ }, "more-itertools": { "hashes": [ - "sha256:c187a73da93e7a8acc0001572aebc7e3c69daf7bf6881a2cea10650bd4420092", - "sha256:c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e", - "sha256:fcbfeaea0be121980e15bc97b3817b5202ca73d0eae185b4550cbfce2a3ebb3d" + "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4", + "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc", + "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9" ], - "version": "==4.3.0" + "version": "==5.0.0" }, "packaging": { "hashes": [ - "sha256:0886227f54515e592aaa2e5a553332c73962917f2831f1b0f9b9f4380a4b9807", - "sha256:f95a1e147590f204328170981833854229bb2912ac3d5f89e2a8ccd2834800c9" + "sha256:0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af", + "sha256:9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3" ], - "version": "==18.0" + "version": "==19.0" }, "pathlib2": { "hashes": [ - "sha256:8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83", - "sha256:d1aa2a11ba7b8f7b21ab852b1fb5afb277e1bb99d5dfc663380b5015c0d80c5a" + "sha256:25199318e8cc3c25dcb45cbe084cc061051336d5a9ea2a12448d3d8cb748f742", + "sha256:5887121d7f7df3603bca2f710e7219f3eca0eb69e0b7cc6e0a022e155ac931a7" ], "index": "pypi", "markers": "python_version < '3.5'", - "version": "==2.3.2" + "version": "==2.3.3" }, "pbr": { "hashes": [ - "sha256:f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68", - "sha256:f6d5b23f226a2ba58e14e49aa3b1bfaf814d0199144b95d78458212444de1387" + "sha256:a7953f66e1f82e4b061f43096a4bcc058f7d3d41de9b94ac871770e8bdd831a2", + "sha256:d717573351cfe09f49df61906cd272abaa759b3e91744396b804965ff7bff38b" ], - "version": "==5.1.1" + "version": "==5.1.2" }, "pluggy": { "hashes": [ - "sha256:447ba94990e8014ee25ec853339faf7b0fc8050cdc3289d4d71f7f410fb90095", - "sha256:bde19360a8ec4dfd8a20dcb811780a30998101f078fc7ded6162f0076f50508f" + "sha256:8ddc32f03971bfdf900a81961a48ccf2fb677cf7715108f85295c67405798616", + "sha256:980710797ff6a041e9a73a5787804f848996ecaa6f8a1b1e08224a5894f2074a" ], - "version": "==0.8.0" + "version": "==0.8.1" }, "pudb": { "hashes": [ @@ -348,10 +348,10 @@ }, "pygments": { "hashes": [ - "sha256:6301ecb0997a52d2d31385e62d0a4a4cf18d2f2da7054a5ddad5c366cd39cee7", - "sha256:82666aac15622bd7bb685a4ee7f6625dd716da3ef7473620c192c0168aae64fc" + "sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a", + "sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d" ], - "version": "==2.3.0" + "version": "==2.3.1" }, "pylint": { "hashes": [ @@ -363,34 +363,34 @@ }, "pyparsing": { "hashes": [ - "sha256:40856e74d4987de5d01761a22d1621ae1c7f8774585acae358aa5c5936c6c90b", - "sha256:f353aab21fd474459d97b709e527b5571314ee5f067441dc9f88e33eecd96592" + "sha256:66c9268862641abcac4a96ba74506e594c884e3f57690a696d21ad8210ed667a", + "sha256:f6c5ef0d7480ad048c054c37632c67fca55299990fff127850181659eea33fc3" ], - "version": "==2.3.0" + "version": "==2.3.1" }, "pytest": { "hashes": [ - "sha256:1d131cc532be0023ef8ae265e2a779938d0619bb6c2510f52987ffcba7fa1ee4", - "sha256:ca4761407f1acc85ffd1609f464ca20bb71a767803505bd4127d0e45c5a50e23" + "sha256:65aeaa77ae87c7fc95de56285282546cfa9c886dc8e5dc78313db1c25e21bc07", + "sha256:6ac6d467d9f053e95aaacd79f831dbecfe730f419c6c7022cb316b365cd9199d" ], "index": "pypi", - "version": "==4.0.1" + "version": "==4.2.0" }, "pytest-cov": { "hashes": [ - "sha256:513c425e931a0344944f84ea47f3956be0e416d95acbd897a44970c8d926d5d7", - "sha256:e360f048b7dae3f2f2a9a4d067b2dd6b6a015d384d1577c994a43f3f7cbad762" + "sha256:0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33", + "sha256:230ef817450ab0699c6cc3c9c8f7a829c34674456f2ed8df1fe1d39780f7c87f" ], "index": "pypi", - "version": "==2.6.0" + "version": "==2.6.1" }, "pytest-mock": { "hashes": [ - "sha256:53801e621223d34724926a5c98bd90e8e417ce35264365d39d6c896388dcc928", - "sha256:d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0" + "sha256:4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4", + "sha256:bfdf02789e3d197bd682a758cae0a4a18706566395fbe2803badcd1335e0173e" ], "index": "pypi", - "version": "==1.10.0" + "version": "==1.10.1" }, "pytoml": { "hashes": [ @@ -400,18 +400,18 @@ }, "pytz": { "hashes": [ - "sha256:31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca", - "sha256:8e0f8568c118d3077b46be7d654cc8167fa916092e28320cde048e54bfc9f1e6" + "sha256:32b0891edff07e28efe91284ed9c31e123d84bea3fd98e1f72be2508f43ef8d9", + "sha256:d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c" ], - "version": "==2018.7" + "version": "==2018.9" }, "requests": { "hashes": [ - "sha256:65b3a120e4329e33c9889db89c80976c5272f56ea92d3e74da8a463992e3ff54", - "sha256:ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263" + "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", + "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" ], "index": "pypi", - "version": "==2.20.1" + "version": "==2.21.0" }, "scandir": { "hashes": [ @@ -433,10 +433,10 @@ }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" ], - "version": "==1.11.0" + "version": "==1.12.0" }, "snowballstemmer": { "hashes": [ @@ -447,11 +447,26 @@ }, "sphinx": { "hashes": [ - "sha256:120732cbddb1b2364471c3d9f8bfd4b0c5b550862f99a65736c77f970b142aea", - "sha256:b348790776490894e0424101af9c8413f2a86831524bd55c5f379d3e3e12ca64" + "sha256:b53904fa7cb4b06a39409a492b949193a1b68cc7241a1a8ce9974f86f0d24287", + "sha256:c1c00fc4f6e8b101a0d037065043460dffc2d507257f2f11acaed71fd2b0c83c" + ], + "index": "pypi", + "version": "==1.8.4" + }, + "sphinx-rtd-theme": { + "hashes": [ + "sha256:02f02a676d6baabb758a20c7a479d58648e0f64f13e07d1b388e9bb2afe86a09", + "sha256:d0f6bc70f98961145c5b0e26a992829363a197321ba571b31b24ea91879e0c96" + ], + "index": "pypi", + "version": "==0.4.2" + }, + "sphinx-sitemap": { + "hashes": [ + "sha256:cc48046fb29d8aabc2cc4c5278d2f1a00a50613418bc51eb611a9528a9db5cfa" ], "index": "pypi", - "version": "==1.8.2" + "version": "==1.0.2" }, "sphinxcontrib-websupport": { "hashes": [ @@ -469,11 +484,11 @@ }, "tox": { "hashes": [ - "sha256:513e32fdf2f9e2d583c2f248f47ba9886428c949f068ac54a0469cac55df5862", - "sha256:75fa30e8329b41b664585f5fb837e23ce1d7e6fa1f7811f2be571c990f9d911b" + "sha256:04f8f1aa05de8e76d7a266ccd14e0d665d429977cd42123bc38efa9b59964e9e", + "sha256:25ef928babe88c71e3ed3af0c464d1160b01fca2dd1870a5bb26c2dea61a17fc" ], "index": "pypi", - "version": "==3.5.3" + "version": "==3.7.0" }, "urllib3": { "hashes": [ @@ -491,10 +506,10 @@ }, "virtualenv": { "hashes": [ - "sha256:686176c23a538ecc56d27ed9d5217abd34644823d6391cbeb232f42bf722baad", - "sha256:f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208" + "sha256:8b9abfc51c38b70f61634bf265e5beacf6fae11fc25d355d1871f49b8e45f0db", + "sha256:cceab52aa7d4df1e1871a70236eb2b89fcfe29b6b43510d9738689787c513261" ], - "version": "==16.1.0" + "version": "==16.4.0" }, "vulture": { "hashes": [ @@ -506,9 +521,9 @@ }, "wrapt": { "hashes": [ - "sha256:d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6" + "sha256:4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533" ], - "version": "==1.10.11" + "version": "==1.11.1" } } } @@ -109,7 +109,10 @@ Contributing Pull requests are welcome, preferably via emailed output of ``git request-pull`` sent to the maintainer (see here_ for more information). -Bug reports should also be directed to the maintainer via email. +Bug reports should also be directed to the maintainer via email_. + +If you aren't hosting a fork anywhere online, you can also send patches +using ``git format-patch`` (again, see `the official documentation`_ ). Releases -------- @@ -143,3 +146,5 @@ Schauenberg and the notes_db.py module from nvpy_ by Charl P. Botha. .. _wheel: https://pythonwheels.com/ .. _PyPI: https://pypi.org/project/nncli/ .. _keyserver: https://pgp.mit.edu/pks/lookup?op=get&search=0x323C9F1784BDDD43 +.. _email: daniel@danielmoch.com +.. _the official documentation: https://www.git-scm.com/docs/git-format-patch @@ -1,3 +1,5 @@ +TODO +---- - Create a proper groff manual - Address duplicate code (pylint finding) - Target 80% unit test coverage diff --git a/docs/docutils.conf b/docs/docutils.conf new file mode 100644 index 0000000..08ffa5a --- /dev/null +++ b/docs/docutils.conf @@ -0,0 +1,2 @@ +[html4css1 writer] +cloak-email-addresses: yes diff --git a/docs/source/conf.py b/docs/source/conf.py index baedf52..eddb6a3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -42,6 +42,7 @@ extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.intersphinx', + 'sphinx_sitemap', ] # Add any paths that contain templates here, relative to this directory. @@ -77,13 +78,18 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -html_theme = 'default' +html_theme = 'sphinx_rtd_theme' +html_extra_path = ['robots.txt'] + +html_baseurl = 'https://nncli.org/' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. # -# html_theme_options = {} +html_theme_options = { + 'canonical_url': 'https://nncli.org/' +} # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, diff --git a/docs/source/index.rst b/docs/source/index.rst index ae26883..bcab7d0 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -10,16 +10,13 @@ NextCloud Notes Command Line Interface .. image:: https://img.shields.io/pypi/l/nncli.svg :alt: PyPI - License - :target: https://git.danielmoch.com/nncli.git/tree/LICENSE + :target: https://git.danielmoch.com/nncli/tree/LICENSE .. image:: https://builds.danielmoch.com/badges/nncli.svg :alt: Daniel Moch CI :target: https://builds.danielmoch.com/#/builders/nncli .. image:: https://img.shields.io/pypi/v/nncli.svg :alt: PyPI :target: https://pypi.org/project/nncli - .. image:: https://img.shields.io/readthedocs/nncli.svg - :alt: Read the Docs - :target: https://nncli.readthedocs.io .. include:: ../../README.rst diff --git a/docs/source/robots.txt b/docs/source/robots.txt new file mode 100644 index 0000000..5142a26 --- /dev/null +++ b/docs/source/robots.txt @@ -0,0 +1,4 @@ +Sitemap: https://nncli.org/sitemap.xml + +User-Agent: * +Host: nncli.org diff --git a/nncli/__init__.py b/nncli/__init__.py index cc6d151..c5d50c5 100644 --- a/nncli/__init__.py +++ b/nncli/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- """NextCloud Notes Command Line Interface""" -__version__ = '0.3.2' +__version__ = '0.3.3' diff --git a/nncli/config.py b/nncli/config.py index c0980c5..0e97faf 100644 --- a/nncli/config.py +++ b/nncli/config.py @@ -132,7 +132,7 @@ class Config: 'clr_help_descr_bg' : 'default' } - parser = configparser.SafeConfigParser(defaults) + parser = configparser.ConfigParser(defaults) if custom_file is not None: parser.read([custom_file]) else: diff --git a/nncli/gui.py b/nncli/gui.py index 3e886a2..44ecfd2 100644 --- a/nncli/gui.py +++ b/nncli/gui.py @@ -897,8 +897,7 @@ class NncliGui: self._gui_footer_log_clear() self.logs = [] else: - # for some reason having problems with this being empty? - if not self.logs: + if self.logs: self.logs.pop(0) log_pile = [] @@ -31,4 +31,4 @@ whitelist_externals = make commands = make test-install make install - make test + python -m pytest |