[Pkg-freeipa-devel] custodia: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Sat Dec 23 08:44:58 UTC 2017
.coveragerc | 2
.dockerignore | 9
.gitignore | 14
.travis.yml | 47
API.md | 41
MANIFEST.in | 20
Makefile | 205 +++
README | 56
README.md | 49
bin/custodia | 25
bin/custodia-cli | 25
conftest.py | 1
contrib/config/README.txt | 17
contrib/config/custodia/custodia.conf | 32
contrib/config/systemd/system/custodia at .service | 19
contrib/config/systemd/system/custodia at .socket | 16
contrib/config/tmpfiles.d/custodia.conf | 1
contrib/docker/Dockerfile | 37
contrib/docker/demo.conf | 39
custodia.conf | 87 +
custodia.spec | 260 ++++
custodia/custodia | 115 -
custodia/httpd/authenticators.py | 63 -
custodia/httpd/authorizers.py | 48
custodia/httpd/consumer.py | 67 -
custodia/httpd/server.py | 317 -----
custodia/log.py | 72 -
custodia/message/common.py | 63 -
custodia/message/formats.py | 63 -
custodia/message/kem.py | 404 ------
custodia/message/simple.py | 33
custodia/root.py | 16
custodia/secrets.py | 581 ----------
custodia/store/enclite.py | 37
custodia/store/interface.py | 30
custodia/store/sqlite.py | 205 ---
debian/changelog | 19
debian/compat | 2
debian/control | 28
debian/copyright | 2
debian/patches/Allow-tox-to-use-locally-installed-packages.patch | 55
debian/patches/call-python-coverage.diff | 13
debian/patches/disable-intersphinx.diff | 33
debian/patches/dont-install-deps.diff | 56
debian/patches/fix-tox-env-for-machine-installed-python-version.diff | 23
debian/patches/series | 6
debian/rules | 26
debian/watch | 2
docs/Makefile | 5
docs/docs_requirements.txt | 6
docs/source/_static/.gitignore | 1
docs/source/api.rst | 198 +++
docs/source/commands.rst | 18
docs/source/conf.py | 39
docs/source/config.rst | 164 ++
docs/source/container.rst | 80 +
docs/source/examples/cfgparser.py | 152 ++
docs/source/examples/cfgparser.rst | 6
docs/source/examples/index.rst | 9
docs/source/examples/misc.rst | 38
docs/source/examples/yaml.rst | 6
docs/source/examples/yaml_ext.py | 44
docs/source/index.rst | 9
docs/source/plugins/authenticators.rst | 31
docs/source/plugins/authorizers.rst | 24
docs/source/plugins/baseclasses.rst | 38
docs/source/plugins/clients.rst | 24
docs/source/plugins/consumers.rst | 24
docs/source/plugins/index.rst | 66 +
docs/source/plugins/stores.rst | 24
docs/source/quick.rst | 312 +++++
docs/source/readme.rst | 55
docs/source/spelling_wordlist.txt | 70 +
examples/enclite.db |binary
man/custodia.7 | 8
requirements.txt | 2
setup.cfg | 8
setup.py | 154 ++
src/custodia/__about__.py | 19
src/custodia/__init__.py | 3
src/custodia/cli/__init__.py | 326 +++++
src/custodia/cli/__main__.py | 7
src/custodia/client.py | 293 +++++
src/custodia/compat.py | 25
src/custodia/forwarder.py | 86 +
src/custodia/httpd/authenticators.py | 134 ++
src/custodia/httpd/authorizers.py | 80 +
src/custodia/httpd/consumer.py | 13
src/custodia/httpd/server.py | 545 +++++++++
src/custodia/log.py | 190 +++
src/custodia/message/common.py | 68 +
src/custodia/message/formats.py | 64 +
src/custodia/message/kem.py | 247 ++++
src/custodia/message/simple.py | 42
src/custodia/plugin.py | 481 ++++++++
src/custodia/root.py | 20
src/custodia/secrets.py | 400 ++++++
src/custodia/server/__init__.py | 141 ++
src/custodia/server/__main__.py | 7
src/custodia/server/args.py | 80 +
src/custodia/server/config.py | 166 ++
src/custodia/store/encgen.py | 82 +
src/custodia/store/enclite.py | 40
src/custodia/store/etcdstore.py | 122 ++
src/custodia/store/interface.py | 12
src/custodia/store/sqlite.py | 145 ++
tests/ca/.gitignore | 1
tests/ca/custodia-ca.conf | 95 +
tests/ca/custodia-ca.key | 28
tests/ca/custodia-ca.pem | 83 +
tests/ca/custodia-ca.sh | 63 +
tests/ca/custodia-client.conf | 22
tests/ca/custodia-client.key | 28
tests/ca/custodia-client.pem | 82 +
tests/ca/custodia-server.conf | 22
tests/ca/custodia-server.key | 28
tests/ca/custodia-server.pem | 85 +
tests/client.py | 21
tests/conftest.py | 39
tests/custodia.py | 62 -
tests/empty.conf | 2
tests/empty.conf.d/root.conf | 2
tests/test_authenticators.py | 140 ++
tests/test_cli.py | 97 +
tests/test_custodia.py | 482 ++++++++
tests/test_message_kem.py | 203 +++
tests/test_misc.py | 65 +
tests/test_plugins.py | 50
tests/test_secrets.py | 413 +++++++
tests/test_server.py | 99 +
tests/test_store.py | 72 +
tests/test_store_sqlite.py | 129 ++
tests/tests.py | 19
tox.ini | 86 -
134 files changed, 8788 insertions(+), 2564 deletions(-)
New commits:
commit 3bed70e54b244b39b66a68795e5ee4988aa60b77
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 10:44:20 2017 +0200
releasing package custodia version 0.5.0-1
diff --git a/debian/changelog b/debian/changelog
index 87c6a94..2e973a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-custodia (0.5.0-1) UNRELEASED; urgency=medium
+custodia (0.5.0-1) unstable; urgency=medium
* New upstream release.
* control, copyright, watch: Update upstream urls.
@@ -15,7 +15,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* rules: Add python3 tests, override dh_clean.
* control: Bump python-jwcrypto2 dependency to 0.4.2.
- -- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 10:44:08 +0200
custodia (0.1.0-6) unstable; urgency=medium
commit bcd7fb22b8f89f9d88874f3c84f19021f30c52ef
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 10:44:06 2017 +0200
control: Bump python-jwcrypto2 dependency to 0.4.2.
diff --git a/debian/changelog b/debian/changelog
index 587729a..87c6a94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* control: Add python-requests to b-deps/deps.
* control: Add python-systemd to b-deps/deps.
* rules: Add python3 tests, override dh_clean.
+ * control: Bump python-jwcrypto2 dependency to 0.4.2.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/control b/debian/control
index d426c3b..69f3a8d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
python-all (>= 2.6.6-3),
python-coverage,
python-flake8,
- python-jwcrypto,
+ python-jwcrypto (>= 0.4.2),
python-pep8-naming,
python-pytest,
python-requests,
@@ -22,7 +22,7 @@ Build-Depends:
python3-all (>= 2.6.6-3),
python3-coverage,
python3-flake8,
- python3-jwcrypto,
+ python3-jwcrypto (>= 0.4.2),
python3-pep8-naming,
python3-pytest,
python3-requests,
@@ -39,7 +39,7 @@ Package: custodia
Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
python-custodia,
- python-jwcrypto,
+ python-jwcrypto (>= 0.4.2),
Description: Modular and pluggable Secrets Manager
Custodia allows one to serve retrieve, manage and store secrets for other
applications. It is useful for distributed, stateless applications that use
@@ -50,7 +50,7 @@ Description: Modular and pluggable Secrets Manager
Package: python-custodia
Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
- python-jwcrypto,
+ python-jwcrypto (>= 0.4.2),
python-requests,
python-systemd,
Description: Python bindings to Custodia -- Modular and pluggable Secrets Manager
@@ -65,7 +65,7 @@ Description: Python bindings to Custodia -- Modular and pluggable Secrets Manage
Package: python3-custodia
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends},
- python3-jwcrypto,
+ python3-jwcrypto (>= 0.4.2),
python3-requests,
python3-systemd,
Description: Python3 bindings to Custodia -- Modular and pluggable Secrets Manager
commit 4d78a5d76c01ed9511efc757235f22ab46049948
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 10:39:14 2017 +0200
rules: Add python3 tests, override dh_clean.
diff --git a/debian/changelog b/debian/changelog
index ffb3281..587729a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
env variable instead of patching.
* control: Add python-requests to b-deps/deps.
* control: Add python-systemd to b-deps/deps.
+ * rules: Add python3 tests, override dh_clean.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/rules b/debian/rules
index be0aef9..1ee7047 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ export PIP_IGNORE_INSTALLED=yes
override_dh_auto_test:
tox --sitepackages -e py27 -- --skip-servertests
+ tox --sitepackages -e py36 -- --skip-servertests
override_dh_auto_install:
dh_auto_install
@@ -27,3 +28,9 @@ override_dh_auto_install:
find debian/.*/ -name 'LICENSE' -exec rm '{}' ';'
for i in bin share/doc/custodia share/man; do \
rm -rf debian/python3-custodia/usr/$$i; done
+
+override_dh_clean:
+ dh_clean
+ rm -f .coverage.*
+ rm -rf .tox
+ rm -rf src/custodia.egg-info
commit 98bba754e00de10e501461fe719429c7a2bdc0a4
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 10:27:34 2017 +0200
fix a typo
diff --git a/debian/changelog b/debian/changelog
index 125dcf9..ffb3281 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* rules: Drop obsolete moving of files.
* Don't run servertests, and disable installing dependencies via an
env variable instead of patching.
- * control: Add python-requests do b-deps/deps.
+ * control: Add python-requests to b-deps/deps.
* control: Add python-systemd to b-deps/deps.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
commit 047a15fca4cd961ffbd1b257693bc3d49012a82d
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 10:27:16 2017 +0200
control: Add python-systemd to b-deps/deps.
diff --git a/debian/changelog b/debian/changelog
index 97668d2..125dcf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* Don't run servertests, and disable installing dependencies via an
env variable instead of patching.
* control: Add python-requests do b-deps/deps.
+ * control: Add python-systemd to b-deps/deps.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/control b/debian/control
index 376f9b9..d426c3b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
python-requests,
python-setuptools,
python-six,
+ python-systemd,
python3-all (>= 2.6.6-3),
python3-coverage,
python3-flake8,
@@ -27,6 +28,7 @@ Build-Depends:
python3-requests,
python3-setuptools,
python3-six,
+ python3-systemd,
tox,
Standards-Version: 4.1.2
Vcs-Git: https://anonscm.debian.org/git/pkg-freeipa/custodia.git
@@ -50,6 +52,7 @@ Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
python-jwcrypto,
python-requests,
+ python-systemd,
Description: Python bindings to Custodia -- Modular and pluggable Secrets Manager
Custodia allows one to serve retrieve, manage and store secrets for other
applications. It is useful for distributed, stateless applications that use
@@ -64,6 +67,7 @@ Architecture: all
Depends: ${misc:Depends}, ${python3:Depends},
python3-jwcrypto,
python3-requests,
+ python3-systemd,
Description: Python3 bindings to Custodia -- Modular and pluggable Secrets Manager
Custodia allows one to serve retrieve, manage and store secrets for other
applications. It is useful for distributed, stateless applications that use
commit 4e5156c72bcb9e79aaee38553a3444c18f044b2d
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 10:22:56 2017 +0200
control: Add python-requests do b-deps/deps.
diff --git a/debian/changelog b/debian/changelog
index 6ae21e3..97668d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* rules: Drop obsolete moving of files.
* Don't run servertests, and disable installing dependencies via an
env variable instead of patching.
+ * control: Add python-requests do b-deps/deps.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/control b/debian/control
index ba97d97..376f9b9 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
python-jwcrypto,
python-pep8-naming,
python-pytest,
+ python-requests,
python-setuptools,
python-six,
python3-all (>= 2.6.6-3),
@@ -23,6 +24,7 @@ Build-Depends:
python3-jwcrypto,
python3-pep8-naming,
python3-pytest,
+ python3-requests,
python3-setuptools,
python3-six,
tox,
@@ -47,6 +49,7 @@ Package: python-custodia
Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
python-jwcrypto,
+ python-requests,
Description: Python bindings to Custodia -- Modular and pluggable Secrets Manager
Custodia allows one to serve retrieve, manage and store secrets for other
applications. It is useful for distributed, stateless applications that use
@@ -60,6 +63,7 @@ Package: python3-custodia
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends},
python3-jwcrypto,
+ python3-requests,
Description: Python3 bindings to Custodia -- Modular and pluggable Secrets Manager
Custodia allows one to serve retrieve, manage and store secrets for other
applications. It is useful for distributed, stateless applications that use
commit d16b8dcad6b8482b24d1ab5b8c5837c8857f1716
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 10:22:28 2017 +0200
Don't run servertests, and disable installing dependencies via an env variable instead of patching.
diff --git a/debian/changelog b/debian/changelog
index 02c6687..6ae21e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* control: Bump policy to 4.1.2, no changes.
* patches: Delete upstreamed patches.
* rules: Drop obsolete moving of files.
+ * Don't run servertests, and disable installing dependencies via an
+ env variable instead of patching.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/patches/call-python-coverage.diff b/debian/patches/call-python-coverage.diff
deleted file mode 100644
index e6d99b3..0000000
--- a/debian/patches/call-python-coverage.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/tox.ini
-+++ b/tox.ini
-@@ -9,8 +9,8 @@ deps =
- cryptography
- sitepackages = True
- commands =
-- coverage run -m pytest --capture=no --strict {posargs}
-- coverage report -m
-+ python-coverage run -m pytest --capture=no --strict {posargs}
-+ python-coverage report -m
-
- [testenv:pep8]
- basepython = python2.7
diff --git a/debian/patches/dont-install-deps.diff b/debian/patches/dont-install-deps.diff
deleted file mode 100644
index cbb6888..0000000
--- a/debian/patches/dont-install-deps.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/tox.ini
-+++ b/tox.ini
-@@ -1,14 +1,14 @@
- [tox]
--envlist = py27,py34,doc,sphinx
-+envlist = py27
-
- [testenv]
- setenv =
- PYTHONPATH = {envsitepackagesdir}
- deps =
-- pytest
-- coverage
-- -r{toxinidir}/requirements.txt
-- cryptography
-+# pytest
-+# coverage
-+# -r{toxinidir}/requirements.txt
-+# cryptography
- sitepackages = True
- commands =
- python-coverage run -m pytest --capture=no --strict {posargs}
-@@ -17,9 +17,9 @@ commands =
- [testenv:pep8]
- basepython = python2.7
- deps =
-- flake8
-- flake8-import-order
-- pep8-naming
-+# flake8
-+# flake8-import-order
-+# pep8-naming
- sitepackages = True
- commands =
- flake8 {posargs}
-@@ -27,9 +27,9 @@ commands =
- [testenv:py3pep8]
- basepython = python3.4
- deps =
-- flake8
-- flake8-import-order
-- pep8-naming
-+# flake8
-+# flake8-import-order
-+# pep8-naming
- sitepackages = True
- commands =
- flake8 {posargs}
-@@ -49,7 +49,6 @@ commands =
-
- [testenv:sphinx]
- basepython = python2.7
--sitepackages = True
- changedir = docs/source
- deps =
- sphinx < 1.3.0
diff --git a/debian/patches/series b/debian/patches/series
index 4a935a3..a82d1b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-Allow-tox-to-use-locally-installed-packages.patch
-call-python-coverage.diff
-fix-tox-env-for-machine-installed-python-version.diff
-dont-install-deps.diff
-disable-intersphinx.diff
+#placeholder
diff --git a/debian/rules b/debian/rules
index 3f77976..be0aef9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,22 @@
# This file was automatically generated by stdeb 0.8.5 at
# Fri, 02 Oct 2015 13:26:38 +0300
export PYBUILD_NAME=custodia
+
+# don't download packages
+export PIP_INDEX_URL=http://host.invalid./
+
+# Don't try to download dnspython3. The package is provided by python-dnspython
+export PIP_NO_DEPS=yes
+
+# Ignore all install packages to enforce installation of sdist. Otherwise tox
+# may pick up this package from global site-packages instead of source dist.
+export PIP_IGNORE_INSTALLED=yes
+
%:
dh $@ --with python2,python3 --buildsystem=pybuild
override_dh_auto_test:
- tox -e py27
+ tox --sitepackages -e py27 -- --skip-servertests
override_dh_auto_install:
dh_auto_install
commit 59c615dff38e15dc6e70ef895cf4f4ac649261d9
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 10:05:52 2017 +0200
rules: Drop obsolete moving of files.
diff --git a/debian/changelog b/debian/changelog
index ae84bc1..02c6687 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* Bump debhelper to 10.
* control: Bump policy to 4.1.2, no changes.
* patches: Delete upstreamed patches.
+ * rules: Drop obsolete moving of files.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/rules b/debian/rules
index ce488cb..3f77976 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,6 @@ override_dh_auto_test:
override_dh_auto_install:
dh_auto_install
mkdir -p debian/custodia/usr/share/doc
- mv debian/python-custodia/usr/share/doc/custodia \
- debian/custodia/usr/share/doc
- mv debian/python-custodia/usr/share/man \
- debian/custodia/usr/share/
- mv debian/python-custodia/usr/bin \
- debian/custodia/usr/sbin
find debian/python*/ -name '*.egg-info' -exec rm '{}' ';'
find debian/.*/ -name 'LICENSE' -exec rm '{}' ';'
for i in bin share/doc/custodia share/man; do \
commit 4c355e307e72295399e80b5a292d48a18c99e55a
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 10:02:05 2017 +0200
patches: Delete upstreamed patches.
diff --git a/debian/changelog b/debian/changelog
index 5e6f0d1..ae84bc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* control: Fix python3-custodia Depends. (Closes: #867397)
* Bump debhelper to 10.
* control: Bump policy to 4.1.2, no changes.
+ * patches: Delete upstreamed patches.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/patches/Allow-tox-to-use-locally-installed-packages.patch b/debian/patches/Allow-tox-to-use-locally-installed-packages.patch
deleted file mode 100644
index f0772b9..0000000
--- a/debian/patches/Allow-tox-to-use-locally-installed-packages.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 88d03775870a5247ac01cb85742402c0e2ed8dd1 Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo at redhat.com>
-Date: Mon, 3 Aug 2015 14:28:10 -0400
-Subject: [PATCH] Allow tox to use locally installed packages
-
-Signed-off-by: Simo Sorce <simo at redhat.com>
----
- tox.ini | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/tox.ini
-+++ b/tox.ini
-@@ -7,6 +7,7 @@ deps =
- coverage
- -r{toxinidir}/requirements.txt
- cryptography
-+sitepackages = True
- commands =
- coverage run -m pytest --capture=no --strict {posargs}
- coverage report -m
-@@ -17,6 +18,7 @@ deps =
- flake8
- flake8-import-order
- pep8-naming
-+sitepackages = True
- commands =
- flake8 {posargs}
-
-@@ -26,15 +28,17 @@ deps =
- flake8
- flake8-import-order
- pep8-naming
-+sitepackages = True
- commands =
- flake8 {posargs}
-
- [testenv:doc]
-+basepython = python2.7
- deps =
- doc8
- docutils
- markdown
--basepython = python2.7
-+sitepackages = True
- commands =
- doc8 --allow-long-titles README
- python setup.py check --restructuredtext --metadata --strict
-@@ -43,6 +47,7 @@ commands =
-
- [testenv:sphinx]
- basepython = python2.7
-+sitepackages = True
- changedir = docs/source
- deps =
- sphinx < 1.3.0
diff --git a/debian/patches/disable-intersphinx.diff b/debian/patches/disable-intersphinx.diff
deleted file mode 100644
index 266ef20..0000000
--- a/debian/patches/disable-intersphinx.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 8e40db86909de67dca1a9b08530bb74e9d6d2c37
-Author: Christian Heimes <cheimes at redhat.com>
-Date: Thu Sep 15 17:23:33 2016 +0200
-
- Disable intersphinx
-
- Interspinx downloads an inventory file from docs.python.org. Custodia
- doesn't need the feature. It just slows down make html and causes
- trouble for packagers.
-
- Closes: #13
- Signed-off-by: Christian Heimes <cheimes at redhat.com>
- Reviewed-by: Simo Sorce <simo at redhat.com>
- Closes #78
-
---- a/docs/source/conf.py
-+++ b/docs/source/conf.py
-@@ -30,7 +30,7 @@ import os
- # ones.
- extensions = [
- 'sphinx.ext.autodoc',
-- 'sphinx.ext.intersphinx',
-+# 'sphinx.ext.intersphinx',
- ]
-
- # Add any paths that contain templates here, relative to this directory.
-@@ -262,4 +262,5 @@ texinfo_documents = [
-
-
- # Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/': None}
-+# Disabled, see https://github.com/latchset/custodia/issues/13
-+# intersphinx_mapping = {'http://docs.python.org/': None}
diff --git a/debian/patches/fix-tox-env-for-machine-installed-python-version.diff b/debian/patches/fix-tox-env-for-machine-installed-python-version.diff
deleted file mode 100644
index 7a4042a..0000000
--- a/debian/patches/fix-tox-env-for-machine-installed-python-version.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 72c9ad1546223ad0aa22bceb8c9b57f885519c9d
-Author: Simo Sorce <simo at redhat.com>
-Date: Mon Sep 28 13:31:37 2015 -0400
-
- Fix tox env for machine installed python version
-
- With this env var we force the local /bin/coverage to still source locally
- unavailable modules from the .tox directory.
-
- Signed-off-by: Simo Sorce <simo at redhat.com>
- Reviewed-by: Christian Heimes <cheimes at redhat.com>
-
---- a/tox.ini
-+++ b/tox.ini
-@@ -2,6 +2,8 @@
- envlist = py27,py34,doc,sphinx
-
- [testenv]
-+setenv =
-+ PYTHONPATH = {envsitepackagesdir}
- deps =
- pytest
- coverage
commit 328eb5561b69b8a9adc72c58607a6ff1085b6b75
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 09:26:59 2017 +0200
control: Bump policy to 4.1.2, no changes.
diff --git a/debian/changelog b/debian/changelog
index 98dca11..5e6f0d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* control: Add VCS urls.
* control: Fix python3-custodia Depends. (Closes: #867397)
* Bump debhelper to 10.
+ * control: Bump policy to 4.1.2, no changes.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/control b/debian/control
index 20b1c68..ba97d97 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends:
python3-setuptools,
python3-six,
tox,
-Standards-Version: 3.9.6
+Standards-Version: 4.1.2
Vcs-Git: https://anonscm.debian.org/git/pkg-freeipa/custodia.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-freeipa/custodia.git
Homepage: https://github.com/latchset/custodia
commit 4f3d402a43fd99e8afca5c47bdf961769a9e7e64
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 09:26:18 2017 +0200
Bump debhelper to 10.
diff --git a/debian/changelog b/debian/changelog
index 9bd6f7f..98dca11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* control, copyright, watch: Update upstream urls.
* control: Add VCS urls.
* control: Fix python3-custodia Depends. (Closes: #867397)
+ * Bump debhelper to 10.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 05c53c6..20b1c68 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Timo Aaltonen <tjaalton at debian.org>
Section: admin
Priority: optional
Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
dh-python,
pep8,
pylint,
commit 2463271734ea3773ed1ae8d6d0dedb3b144312d3
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 09:25:41 2017 +0200
control: Fix python3-custodia Depends. (Closes: #867397)
diff --git a/debian/changelog b/debian/changelog
index f01e0dc..9bd6f7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* New upstream release.
* control, copyright, watch: Update upstream urls.
* control: Add VCS urls.
+ * control: Fix python3-custodia Depends. (Closes: #867397)
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/control b/debian/control
index 0447dae..05c53c6 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,7 @@ Description: Python bindings to Custodia -- Modular and pluggable Secrets Manage
Package: python3-custodia
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
+Depends: ${misc:Depends}, ${python3:Depends},
python3-jwcrypto,
Description: Python3 bindings to Custodia -- Modular and pluggable Secrets Manager
Custodia allows one to serve retrieve, manage and store secrets for other
commit 7148981e529b393e93fe83b389b25cdea2392c9d
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 09:24:35 2017 +0200
control: Add VCS urls.
diff --git a/debian/changelog b/debian/changelog
index c085096..f01e0dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ custodia (0.5.0-1) UNRELEASED; urgency=medium
* New upstream release.
* control, copyright, watch: Update upstream urls.
+ * control: Add VCS urls.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/control b/debian/control
index 5b86d11..0447dae 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,8 @@ Build-Depends:
python3-six,
tox,
Standards-Version: 3.9.6
+Vcs-Git: https://anonscm.debian.org/git/pkg-freeipa/custodia.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-freeipa/custodia.git
Homepage: https://github.com/latchset/custodia
Package: custodia
commit 7ed60b453f9a02c1a9c6e013d054a80445cc87d0
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 09:23:41 2017 +0200
control, copyright, watch: Update upstream urls.
diff --git a/debian/changelog b/debian/changelog
index f9e0d0c..c085096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
custodia (0.5.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * control, copyright, watch: Update upstream urls.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
diff --git a/debian/control b/debian/control
index b03ecc9..5b86d11 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends:
python3-six,
tox,
Standards-Version: 3.9.6
-Homepage: https://github.com/simo5/custodia
+Homepage: https://github.com/latchset/custodia
Package: custodia
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 3edb4a7..f3303a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: custodia
-Source: https://github.com/simo5/custodia
+Source: https://github.com/latchset/custodia
Files: *
Copyright: 2015 Custodia project Contributors
diff --git a/debian/watch b/debian/watch
index fa68306..a49a78e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
# please also check http://pypi.debian.net/custodia/watch
version=3
-https://github.com/simo5/custodia/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz
+https://github.com/latchset/custodia/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz
commit c4f0c952a40f9e6cb27f1f88374718d24ca60e06
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Dec 23 09:21:57 2017 +0200
update the version
diff --git a/debian/changelog b/debian/changelog
index bfe3038..f9e0d0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+custodia (0.5.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Sat, 23 Dec 2017 09:20:55 +0200
+
custodia (0.1.0-6) unstable; urgency=medium
* disable-intersphinx.diff: Disable intersphinx, which would download
commit 6019cd361df693b963f16a6e7e8aad8d2be50be0
Author: Christian Heimes <cheimes at redhat.com>
Date: Wed May 10 17:59:47 2017 +0200
Release v0.5.0
Signed-off-by: Christian Heimes <cheimes at redhat.com>
diff --git a/src/custodia/__about__.py b/src/custodia/__about__.py
index 605305a..d81ab3b 100644
--- a/src/custodia/__about__.py
+++ b/src/custodia/__about__.py
@@ -9,7 +9,7 @@ __title__ = 'custodia'
__summary__ = 'A service to manage, retrieve and store secrets.'
__uri__ = 'https://github.com/latchset/custodia'
-__version_info__ = (0, 5, 'dev1')
+__version_info__ = (0, 5, 0)
__version__ = '.'.join(str(v) for v in __version_info__)
__author__ = 'Custodia project Contributors'
commit 2fa648801f1147eae2d5c4d9365fb6c0fc884a07
Author: Christian Heimes <cheimes at redhat.com>
Date: Wed May 10 17:42:01 2017 +0200
Prepare release and add make releasecheck
make releasecheck performs a couple of actions that ensure we are in a
good state for a new release.
Signed-off-by: Christian Heimes <cheimes at redhat.com>
diff --git a/Makefile b/Makefile
index ba79953..56cb17b 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ docs: $(DOCS_DIR)/source/readme.rst
PYTHONPATH=$(CURDIR)/src \
$(MAKE) -C $(DOCS_DIR) html SPHINXBUILD="$(PYTHON) -m sphinx"
-.PHONY: install egg_info run packages release
+.PHONY: install egg_info run packages release releasecheck
install: clean_socket egg_info
$(PYTHON) setup.py install --root "$(PREFIX)"
install -d "$(PREFIX)/share/man/man7"
@@ -108,6 +108,18 @@ release: clean
@echo "* Upload source dist and wheel to PyPI:"
@echo " twine-3 upload dist/*.gz dist/*.whl"
+releasecheck: clean
+ @ # ensure README is rebuild
+ touch README.md
+ $(MAKE) README $(DOCS_DIR)/source/readme.rst
+ @ # check for version in spec
+ grep -q 'version $(VERSION)' custodia.spec || exit 1
+ @ # re-run tox
+ tox -r
+ $(MAKE) packages
+ $(MAKE) rpm
+ $(MAKE) dockerbuild
+
run: egg_info
$(PYTHON) $(CURDIR)/bin/custodia $(CONF)
More information about the Pkg-freeipa-devel
mailing list