commit: a153cacf6b47788c9a017c37f78469e009e4ffff
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 20 21:17:27 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Dec 22 22:57:48 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=a153cacf
Move the 3 pkgs into their own *-pkg dir
This makes releasing each pkg independently easier.
testpath: Update paths for the new directory structure
---
gkeys-gen/MANIFEST.in | 2 ++
{bin => gkeys-gen/bin}/gkey-gen | 0
{gkeygen => gkeys-gen/gkeygen}/__init__.py | 0
{gkeygen => gkeys-gen/gkeygen}/actions.py | 0
{gkeygen => gkeys-gen/gkeygen}/cli.py | 0
gkeygen_setup.py => gkeys-gen/setup.py | 4 ++--
gkeys-ldap/MANIFEST.in | 2 ++
bin/gkey-ldap => gkeys-ldap/bin/gkeys-ldap | 0
{bin => gkeys-ldap/bin}/update-seeds.sh | 0
{etc => gkeys-ldap/etc}/update-seeds.conf | 0
{gkeyldap => gkeys-ldap/gkeyldap}/__init__.py | 0
{gkeyldap => gkeys-ldap/gkeyldap}/actions.py | 0
{gkeyldap => gkeys-ldap/gkeyldap}/cli.py | 0
{gkeyldap => gkeys-ldap/gkeyldap}/config.py | 0
{gkeyldap => gkeys-ldap/gkeyldap}/connect.py | 0
{gkeyldap => gkeys-ldap/gkeyldap}/search.py | 0
gkeyldap_setup.py => gkeys-ldap/setup.py | 0
gkeys/MANIFEST.in | 2 ++
{bin => gkeys/bin}/gkeys | 0
{etc => gkeys/etc}/gkeys.conf.sample | 0
gkeys/{ => gkeys}/__init__.py | 0
gkeys/{ => gkeys}/actions.py | 0
gkeys/{ => gkeys}/base.py | 0
gkeys/{ => gkeys}/checks.py | 0
gkeys/{ => gkeys}/cli.py | 0
gkeys/{ => gkeys}/config.py | 0
gkeys/{ => gkeys}/fileops.py | 0
gkeys/{ => gkeys}/lib.py | 0
gkeys/{ => gkeys}/log.py | 0
gkeys/{ => gkeys}/seed.py | 0
gkeys/{ => gkeys}/seedhandler.py | 0
gkeys/{ => gkeys}/utils.py | 0
gkeys_setup.py => gkeys/setup.py | 0
testpath | 8 ++++----
34 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/gkeys-gen/MANIFEST.in b/gkeys-gen/MANIFEST.in
new file mode 100644
index 0000000..c1a7121
--- /dev/null
+++ b/gkeys-gen/MANIFEST.in
@@ -0,0 +1,2 @@
+include LICENSE
+include README.md
diff --git a/bin/gkey-gen b/gkeys-gen/bin/gkey-gen
similarity index 100%
rename from bin/gkey-gen
rename to gkeys-gen/bin/gkey-gen
diff --git a/gkeygen/__init__.py b/gkeys-gen/gkeygen/__init__.py
similarity index 100%
rename from gkeygen/__init__.py
rename to gkeys-gen/gkeygen/__init__.py
diff --git a/gkeygen/actions.py b/gkeys-gen/gkeygen/actions.py
similarity index 100%
rename from gkeygen/actions.py
rename to gkeys-gen/gkeygen/actions.py
diff --git a/gkeygen/cli.py b/gkeys-gen/gkeygen/cli.py
similarity index 100%
rename from gkeygen/cli.py
rename to gkeys-gen/gkeygen/cli.py
diff --git a/gkeygen_setup.py b/gkeys-gen/setup.py
similarity index 95%
rename from gkeygen_setup.py
rename to gkeys-gen/setup.py
index 4101d85..e2ac6b3 100755
--- a/gkeygen_setup.py
+++ b/gkeys-gen/setup.py
@@ -28,8 +28,8 @@ setup(
maintainer_email='gk...@gentoo.org',
url="https://wiki.gentoo.org/wiki/Project:Gentoo-keys";,
download_url='',
- packages=['gkeyldap'],
- scripts=['bin/gkey-ldap'],
+ packages=['gkeygen'],
+ scripts=['bin/gkey-gen'],
license=__license__,
long_description=open('README.md').read(),
keywords='gpg',
diff --git a/gkeys-ldap/MANIFEST.in b/gkeys-ldap/MANIFEST.in
new file mode 100644
index 0000000..c1a7121
--- /dev/null
+++ b/gkeys-ldap/MANIFEST.in
@@ -0,0 +1,2 @@
+include LICENSE
+include README.md
diff --git a/bin/gkey-ldap b/gkeys-ldap/bin/gkeys-ldap
similarity index 100%
rename from bin/gkey-ldap
rename to gkeys-ldap/bin/gkeys-ldap
diff --git a/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
similarity index 100%
rename from bin/update-seeds.sh
rename to gkeys-ldap/bin/update-seeds.sh
diff --git a/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf
similarity index 100%
rename from etc/update-seeds.conf
rename to gkeys-ldap/etc/update-seeds.conf
diff --git a/gkeyldap/__init__.py b/gkeys-ldap/gkeyldap/__init__.py
similarity index 100%
rename from gkeyldap/__init__.py
rename to gkeys-ldap/gkeyldap/__init__.py
diff --git a/gkeyldap/actions.py b/gkeys-ldap/gkeyldap/actions.py
similarity index 100%
rename from gkeyldap/actions.py
rename to gkeys-ldap/gkeyldap/actions.py
diff --git a/gkeyldap/cli.py b/gkeys-ldap/gkeyldap/cli.py
similarity index 100%
rename from gkeyldap/cli.py
rename to gkeys-ldap/gkeyldap/cli.py
diff --git a/gkeyldap/config.py b/gkeys-ldap/gkeyldap/config.py
similarity index 100%
rename from gkeyldap/config.py
rename to gkeys-ldap/gkeyldap/config.py
diff --git a/gkeyldap/connect.py b/gkeys-ldap/gkeyldap/connect.py
similarity index 100%
rename from gkeyldap/connect.py
rename to gkeys-ldap/gkeyldap/connect.py
diff --git a/gkeyldap/search.py b/gkeys-ldap/gkeyldap/search.py
similarity index 100%
rename from gkeyldap/search.py
rename to gkeys-ldap/gkeyldap/search.py
diff --git a/gkeyldap_setup.py b/gkeys-ldap/setup.py
similarity index 100%
rename from gkeyldap_setup.py
rename to gkeys-ldap/setup.py
diff --git a/gkeys/MANIFEST.in b/gkeys/MANIFEST.in
new file mode 100644
index 0000000..c1a7121
--- /dev/null
+++ b/gkeys/MANIFEST.in
@@ -0,0 +1,2 @@
+include LICENSE
+include README.md
diff --git a/bin/gkeys b/gkeys/bin/gkeys
similarity index 100%
rename from bin/gkeys
rename to gkeys/bin/gkeys
diff --git a/etc/gkeys.conf.sample b/gkeys/etc/gkeys.conf.sample
similarity index 100%
rename from etc/gkeys.conf.sample
rename to gkeys/etc/gkeys.conf.sample
diff --git a/gkeys/__init__.py b/gkeys/gkeys/__init__.py
similarity index 100%
rename from gkeys/__init__.py
rename to gkeys/gkeys/__init__.py
diff --git a/gkeys/actions.py b/gkeys/gkeys/actions.py
similarity index 100%
rename from gkeys/actions.py
rename to gkeys/gkeys/actions.py
diff --git a/gkeys/base.py b/gkeys/gkeys/base.py
similarity index 100%
rename from gkeys/base.py
rename to gkeys/gkeys/base.py
diff --git a/gkeys/checks.py b/gkeys/gkeys/checks.py
similarity index 100%
rename from gkeys/checks.py
rename to gkeys/gkeys/checks.py
diff --git a/gkeys/cli.py b/gkeys/gkeys/cli.py
similarity index 100%
rename from gkeys/cli.py
rename to gkeys/gkeys/cli.py
diff --git a/gkeys/config.py b/gkeys/gkeys/config.py
similarity index 100%
rename from gkeys/config.py
rename to gkeys/gkeys/config.py
diff --git a/gkeys/fileops.py b/gkeys/gkeys/fileops.py
similarity index 100%
rename from gkeys/fileops.py
rename to gkeys/gkeys/fileops.py
diff --git a/gkeys/lib.py b/gkeys/gkeys/lib.py
similarity index 100%
rename from gkeys/lib.py
rename to gkeys/gkeys/lib.py
diff --git a/gkeys/log.py b/gkeys/gkeys/log.py
similarity index 100%
rename from gkeys/log.py
rename to gkeys/gkeys/log.py
diff --git a/gkeys/seed.py b/gkeys/gkeys/seed.py
similarity index 100%
rename from gkeys/seed.py
rename to gkeys/gkeys/seed.py
diff --git a/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py
similarity index 100%
rename from gkeys/seedhandler.py
rename to gkeys/gkeys/seedhandler.py
diff --git a/gkeys/utils.py b/gkeys/gkeys/utils.py
similarity index 100%
rename from gkeys/utils.py
rename to gkeys/gkeys/utils.py
diff --git a/gkeys_setup.py b/gkeys/setup.py
similarity index 100%
rename from gkeys_setup.py
rename to gkeys/setup.py
diff --git a/testpath b/testpath
index 3bf8bde..b624ba2 100644
--- a/testpath
+++ b/testpath
@@ -12,9 +12,9 @@
# $ esearch some-package
if [[ "$SHELL" =~ "zsh" ]]; then
- export PATH="$(dirname $0)/../pyGPG/bin:$(dirname $0)/bin:${PATH}"
- export PYTHONPATH="$(dirname $0)/../pyGPG/:$(dirname
$0)/../ssl-fetch/:$(dirname $0)/:${PYTHONPATH}"
+ export PATH="$(dirname $0)/../pyGPG/bin:$(dirname $0)/gkeys/bin:$(dirname
$0)/gkeys-ldap/bin:$(dirname $0)/gkeys-gen/bin:${PATH}"
+ export PYTHONPATH="$(dirname $0)/../pyGPG/:$(dirname
$0)/../ssl-fetch/:$(dirname $0)/gkeys/:$(dirname $0)/gkeys-ldap/:$(dirname
$0)/gkeys-gen/:${PYTHONPATH}"
else
- export PATH="$(dirname $BASH_SOURCE[0])/../pyGPG/bin:$(dirname
$BASH_SOURCE[0])/bin:${PATH}"
- export PYTHONPATH="$(dirname $BASH_SOURCE[0])/../pyGPG/:$(dirname
$BASH_SOURCE[0])/../ssl-fetch/:$(dirname $BASH_SOURCE[0])/:${PYTHONPATH}"
+ export PATH="$(dirname $BASH_SOURCE[0])/../pyGPG/bin:$(dirname
$BASH_SOURCE[0])/gkeys/bin:$(dirname $BASH_SOURCE[0])/gkeys-ldap/bin:$(dirname
$BASH_SOURCE[0])/gkeys-gen/bin:${PATH}"
+ export PYTHONPATH="$(dirname $BASH_SOURCE[0])/../pyGPG/:$(dirname
$BASH_SOURCE[0])/../ssl-fetch/:$(dirname $BASH_SOURCE[0])/gkeys/:$(dirname
$BASH_SOURCE[0])/gkeys-gen/:$(dirname
$BASH_SOURCE[0])/gkeys-ldap/:${PYTHONPATH}"
fi
