From 37967a81085a05d084ece3aaac946b6c9be29077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 10 Aug 2017 13:35:15 +0200 Subject: [PATCH] misc: change module name and installation directory (#17959) --- MANIFEST.in | 2 +- {extra => auquotidien}/auquotidien.py | 0 {extra => auquotidien}/modules/__init__.py | 0 {extra => auquotidien}/modules/abelium_domino_synchro.py | 0 {extra => auquotidien}/modules/abelium_domino_ui.py | 0 {extra => auquotidien}/modules/abelium_domino_vars.py | 0 {extra => auquotidien}/modules/abelium_domino_workflow.py | 0 {extra => auquotidien}/modules/abelium_domino_ws.py | 0 {extra => auquotidien}/modules/admin.py | 0 {extra => auquotidien}/modules/agenda.py | 0 {extra => auquotidien}/modules/announces.py | 0 {extra => auquotidien}/modules/announces_ui.py | 0 {extra => auquotidien}/modules/backoffice.py | 0 {extra => auquotidien}/modules/categories_admin.py | 0 {extra => auquotidien}/modules/clicrdv.py | 0 {extra => auquotidien}/modules/connectors.py | 0 {extra => auquotidien}/modules/events.py | 0 {extra => auquotidien}/modules/events_ui.py | 0 {extra => auquotidien}/modules/formpage.py | 0 {extra => auquotidien}/modules/links.py | 0 {extra => auquotidien}/modules/links_ui.py | 0 {extra => auquotidien}/modules/myspace.py | 0 {extra => auquotidien}/modules/payments.py | 0 {extra => auquotidien}/modules/payments_ui.py | 0 {extra => auquotidien}/modules/pyatom/__init__.py | 0 {extra => auquotidien}/modules/pyatom/afl-2.1.txt | 0 {extra => auquotidien}/modules/pyatom/pyatom.py | 0 {extra => auquotidien}/modules/pyatom/readme.txt | 0 {extra => auquotidien}/modules/root.py | 0 {extra => auquotidien}/modules/saml2.py | 0 {extra => auquotidien}/modules/strongbox.py | 0 {extra => auquotidien}/modules/strongbox_ui.py | 0 {extra => auquotidien}/modules/template.py | 0 debian/rules | 3 --- debian/wcs-au-quotidien.init | 2 +- po/Makefile | 2 +- setup.py | 4 ++-- tests/utilities.py | 2 +- 38 files changed, 6 insertions(+), 9 deletions(-) rename {extra => auquotidien}/auquotidien.py (100%) rename {extra => auquotidien}/modules/__init__.py (100%) rename {extra => auquotidien}/modules/abelium_domino_synchro.py (100%) rename {extra => auquotidien}/modules/abelium_domino_ui.py (100%) rename {extra => auquotidien}/modules/abelium_domino_vars.py (100%) rename {extra => auquotidien}/modules/abelium_domino_workflow.py (100%) rename {extra => auquotidien}/modules/abelium_domino_ws.py (100%) rename {extra => auquotidien}/modules/admin.py (100%) rename {extra => auquotidien}/modules/agenda.py (100%) rename {extra => auquotidien}/modules/announces.py (100%) rename {extra => auquotidien}/modules/announces_ui.py (100%) rename {extra => auquotidien}/modules/backoffice.py (100%) rename {extra => auquotidien}/modules/categories_admin.py (100%) rename {extra => auquotidien}/modules/clicrdv.py (100%) rename {extra => auquotidien}/modules/connectors.py (100%) rename {extra => auquotidien}/modules/events.py (100%) rename {extra => auquotidien}/modules/events_ui.py (100%) rename {extra => auquotidien}/modules/formpage.py (100%) rename {extra => auquotidien}/modules/links.py (100%) rename {extra => auquotidien}/modules/links_ui.py (100%) rename {extra => auquotidien}/modules/myspace.py (100%) rename {extra => auquotidien}/modules/payments.py (100%) rename {extra => auquotidien}/modules/payments_ui.py (100%) rename {extra => auquotidien}/modules/pyatom/__init__.py (100%) rename {extra => auquotidien}/modules/pyatom/afl-2.1.txt (100%) rename {extra => auquotidien}/modules/pyatom/pyatom.py (100%) rename {extra => auquotidien}/modules/pyatom/readme.txt (100%) rename {extra => auquotidien}/modules/root.py (100%) rename {extra => auquotidien}/modules/saml2.py (100%) rename {extra => auquotidien}/modules/strongbox.py (100%) rename {extra => auquotidien}/modules/strongbox_ui.py (100%) rename {extra => auquotidien}/modules/template.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index d9763d2..14a2b97 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,7 +7,7 @@ include po/*.po include po/*.pot recursive-include apache-errors/ *.html recursive-include data/themes/ *.css *.png *.jpeg '*.jpg *.xml *.html *.js *.ezt *.gif *.otf -recursive-include extra/ *.py +recursive-include auquotidien/ *.py recursive-include static/ *.png *.jpeg '*.jpg *.js *.gif recursive-include texts/ *.html recursive-include theme/ *.css *.png *.jpeg '*.jpg *.xml *.html *.js *.ezt *.gif diff --git a/extra/auquotidien.py b/auquotidien/auquotidien.py similarity index 100% rename from extra/auquotidien.py rename to auquotidien/auquotidien.py diff --git a/extra/modules/__init__.py b/auquotidien/modules/__init__.py similarity index 100% rename from extra/modules/__init__.py rename to auquotidien/modules/__init__.py diff --git a/extra/modules/abelium_domino_synchro.py b/auquotidien/modules/abelium_domino_synchro.py similarity index 100% rename from extra/modules/abelium_domino_synchro.py rename to auquotidien/modules/abelium_domino_synchro.py diff --git a/extra/modules/abelium_domino_ui.py b/auquotidien/modules/abelium_domino_ui.py similarity index 100% rename from extra/modules/abelium_domino_ui.py rename to auquotidien/modules/abelium_domino_ui.py diff --git a/extra/modules/abelium_domino_vars.py b/auquotidien/modules/abelium_domino_vars.py similarity index 100% rename from extra/modules/abelium_domino_vars.py rename to auquotidien/modules/abelium_domino_vars.py diff --git a/extra/modules/abelium_domino_workflow.py b/auquotidien/modules/abelium_domino_workflow.py similarity index 100% rename from extra/modules/abelium_domino_workflow.py rename to auquotidien/modules/abelium_domino_workflow.py diff --git a/extra/modules/abelium_domino_ws.py b/auquotidien/modules/abelium_domino_ws.py similarity index 100% rename from extra/modules/abelium_domino_ws.py rename to auquotidien/modules/abelium_domino_ws.py diff --git a/extra/modules/admin.py b/auquotidien/modules/admin.py similarity index 100% rename from extra/modules/admin.py rename to auquotidien/modules/admin.py diff --git a/extra/modules/agenda.py b/auquotidien/modules/agenda.py similarity index 100% rename from extra/modules/agenda.py rename to auquotidien/modules/agenda.py diff --git a/extra/modules/announces.py b/auquotidien/modules/announces.py similarity index 100% rename from extra/modules/announces.py rename to auquotidien/modules/announces.py diff --git a/extra/modules/announces_ui.py b/auquotidien/modules/announces_ui.py similarity index 100% rename from extra/modules/announces_ui.py rename to auquotidien/modules/announces_ui.py diff --git a/extra/modules/backoffice.py b/auquotidien/modules/backoffice.py similarity index 100% rename from extra/modules/backoffice.py rename to auquotidien/modules/backoffice.py diff --git a/extra/modules/categories_admin.py b/auquotidien/modules/categories_admin.py similarity index 100% rename from extra/modules/categories_admin.py rename to auquotidien/modules/categories_admin.py diff --git a/extra/modules/clicrdv.py b/auquotidien/modules/clicrdv.py similarity index 100% rename from extra/modules/clicrdv.py rename to auquotidien/modules/clicrdv.py diff --git a/extra/modules/connectors.py b/auquotidien/modules/connectors.py similarity index 100% rename from extra/modules/connectors.py rename to auquotidien/modules/connectors.py diff --git a/extra/modules/events.py b/auquotidien/modules/events.py similarity index 100% rename from extra/modules/events.py rename to auquotidien/modules/events.py diff --git a/extra/modules/events_ui.py b/auquotidien/modules/events_ui.py similarity index 100% rename from extra/modules/events_ui.py rename to auquotidien/modules/events_ui.py diff --git a/extra/modules/formpage.py b/auquotidien/modules/formpage.py similarity index 100% rename from extra/modules/formpage.py rename to auquotidien/modules/formpage.py diff --git a/extra/modules/links.py b/auquotidien/modules/links.py similarity index 100% rename from extra/modules/links.py rename to auquotidien/modules/links.py diff --git a/extra/modules/links_ui.py b/auquotidien/modules/links_ui.py similarity index 100% rename from extra/modules/links_ui.py rename to auquotidien/modules/links_ui.py diff --git a/extra/modules/myspace.py b/auquotidien/modules/myspace.py similarity index 100% rename from extra/modules/myspace.py rename to auquotidien/modules/myspace.py diff --git a/extra/modules/payments.py b/auquotidien/modules/payments.py similarity index 100% rename from extra/modules/payments.py rename to auquotidien/modules/payments.py diff --git a/extra/modules/payments_ui.py b/auquotidien/modules/payments_ui.py similarity index 100% rename from extra/modules/payments_ui.py rename to auquotidien/modules/payments_ui.py diff --git a/extra/modules/pyatom/__init__.py b/auquotidien/modules/pyatom/__init__.py similarity index 100% rename from extra/modules/pyatom/__init__.py rename to auquotidien/modules/pyatom/__init__.py diff --git a/extra/modules/pyatom/afl-2.1.txt b/auquotidien/modules/pyatom/afl-2.1.txt similarity index 100% rename from extra/modules/pyatom/afl-2.1.txt rename to auquotidien/modules/pyatom/afl-2.1.txt diff --git a/extra/modules/pyatom/pyatom.py b/auquotidien/modules/pyatom/pyatom.py similarity index 100% rename from extra/modules/pyatom/pyatom.py rename to auquotidien/modules/pyatom/pyatom.py diff --git a/extra/modules/pyatom/readme.txt b/auquotidien/modules/pyatom/readme.txt similarity index 100% rename from extra/modules/pyatom/readme.txt rename to auquotidien/modules/pyatom/readme.txt diff --git a/extra/modules/root.py b/auquotidien/modules/root.py similarity index 100% rename from extra/modules/root.py rename to auquotidien/modules/root.py diff --git a/extra/modules/saml2.py b/auquotidien/modules/saml2.py similarity index 100% rename from extra/modules/saml2.py rename to auquotidien/modules/saml2.py diff --git a/extra/modules/strongbox.py b/auquotidien/modules/strongbox.py similarity index 100% rename from extra/modules/strongbox.py rename to auquotidien/modules/strongbox.py diff --git a/extra/modules/strongbox_ui.py b/auquotidien/modules/strongbox_ui.py similarity index 100% rename from extra/modules/strongbox_ui.py rename to auquotidien/modules/strongbox_ui.py diff --git a/extra/modules/template.py b/auquotidien/modules/template.py similarity index 100% rename from extra/modules/template.py rename to auquotidien/modules/template.py diff --git a/debian/rules b/debian/rules index 9701d1f..adf9d23 100755 --- a/debian/rules +++ b/debian/rules @@ -31,9 +31,6 @@ install: build dh_installdirs $(PYTHON) setup.py install --prefix=$(DESTDIR)/usr --no-compile - for i in $(CURDIR)/debian/wcs-au-quotidien/usr/lib/python2.*; do \ - mv $$i/site-packages/extra \ - $$i/site-packages/extra-wcs-au-quotidien; done cd po && make install prefix=$(CURDIR)/debian/wcs-au-quotidien/ install -d -m 755 $(DESTDIR)/var/lib/wcs-au-quotidien $(DESTDIR)/etc/wcs install -m 644 wcs-au-quotidien.cfg-sample $(DESTDIR)/etc/wcs/wcs-au-quotidien.cfg diff --git a/debian/wcs-au-quotidien.init b/debian/wcs-au-quotidien.init index df4769a..b4969b5 100755 --- a/debian/wcs-au-quotidien.init +++ b/debian/wcs-au-quotidien.init @@ -19,7 +19,7 @@ PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME PYTHON_VERSION=`/usr/bin/env python -c \ "import sys; print '%d.%d' % (sys.version_info[0], sys.version_info[1])"` -OPTIONS="--extra /usr/lib/pymodules/python$PYTHON_VERSION/extra-wcs-au-quotidien/" +OPTIONS="--extra /usr/lib/pymodules/python$PYTHON_VERSION/auquotidien/" WCS_USER=wcs-au-quotidien WCS_GROUP=wcs-au-quotidien CONFIG_FILE=/etc/wcs/wcs-au-quotidien.cfg diff --git a/po/Makefile b/po/Makefile index 8c0307f..1e971d9 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,6 +1,6 @@ POFILES=$(wildcard *.po) MOFILES=$(POFILES:.po=.mo) -PYFILES=$(shell find ../extra/ ../extra-authentic/ -name '*.py' -or -name '*.ptl') +PYFILES=$(shell find ../auquotidien/ ../auquotidien-authentic/ -name '*.py' -or -name '*.ptl') all: $(MOFILES) diff --git a/setup.py b/setup.py index 70f6ccc..ed1679d 100644 --- a/setup.py +++ b/setup.py @@ -55,8 +55,8 @@ distutils.core.setup( version = get_version(), maintainer = 'Frederic Peters', maintainer_email = 'fpeters@entrouvert.com', - package_dir = { 'extra': 'extra' }, - packages = ['extra', 'extra.modules', 'extra.modules.pyatom'], + package_dir = {'auquotidien': 'auquotidien'}, + packages = ['auquotidien', 'auquotidien.modules', 'auquotidien.modules.pyatom'], cmdclass = {'build_py': qx_build_py, 'sdist': eo_sdist}, data_files = data_tree('share/wcs/texts', 'texts') +\ diff --git a/tests/utilities.py b/tests/utilities.py index 008eb2b..4e0a0c7 100644 --- a/tests/utilities.py +++ b/tests/utilities.py @@ -20,7 +20,7 @@ def create_temporary_pub(): publisher.WcsPublisher.DATA_DIR = os.path.abspath( os.path.join(os.path.dirname(wcs.__file__), '..', 'data')) config.add_section('extra') - config.set('extra', 'auquotidien', os.path.join(os.path.dirname(__file__), '..', 'extra')) + config.set('extra', 'auquotidien', os.path.join(os.path.dirname(__file__), '..', 'auquotidien')) publisher.WcsPublisher.configure(config) pub = publisher.WcsPublisher.create_publisher() # allow saving the user -- 2.14.0