January 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Add get_template_files() function in setup.py for installing web resources.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit ef784165002086cbc5b8131edcde815326a63009 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 03:48:21 2013 +0000 Add get_template_files() function in setup.py for installing web resources. * ADD ``glob`` dependency to setup.py. * ADD ``get_template_files()`` function to setup.py, which simply globs for filenames which match various directory patterns, in order to obtain files which should be installed for BridgeDB's HTTPS distributor. * FIXES a bug where robots.txt was not being installed as a resource file. --- setup.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/setup.py b/setup.py index 876baa8..143db1d 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,8 @@ import os import setuptools import sys +from glob import glob + # Fix circular dependency with setup.py install try: from babel.messages.frontend import compile_catalog, extract_messages @@ -159,6 +161,26 @@ def get_supported_langs(): return lang_dirs, lang_files +def get_template_files(): + """Return the paths to any web resource files to include in the package. + + :rtype: list + :returns: Any files in :attr:`repo_templates` which match one of the glob + patterns in :ivar:`include_patterns`. + """ + include_patterns = ['*.html', + '*.txt', + '*.asc', + 'assets/*'] + template_files = [] + + for include_pattern in include_patterns: + pattern = os.path.join(repo_templates, include_pattern) + matches = glob(pattern) + template_files.extend(matches) + + return template_files + def get_data_files(): """Returns our hard-coded data_files which should be distributed.

1 0

[bridgedb/master] Refactor message_extractors in setuptools.setup() and add a notetoself.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 81d6d5809fc9a2dcc2b0746bda9b0de78494cc81 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 04:51:42 2013 +0000 Refactor message_extractors in setuptools.setup() and add a notetoself. * CHANGE ``message_extractors`` to use the ``pkgpath`` variable. The less places in the code with arbitrary hardcoded paths which may change at some point, the better. * ADD an XXX note about the glob pattern ``public/**`` in ``message_extractors``. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 73f1be2..b231dbd 100644 --- a/setup.py +++ b/setup.py @@ -280,8 +280,10 @@ setuptools.setup( install_requires=get_requirements(), package_data={'bridgedb': get_data_files(filesonly=True)}, exclude_package_data={'bridgedb': ['*.po', '*.pot']}, - message_extractors = {'lib/bridgedb': [ + message_extractors={pkgpath: [ ('**.py', 'python', None), ('templates/**.html', 'mako', None), ('public/**', 'ignore', None)]}, ) +# XXX I think we don't need the 'public/**' babel.messages.frontend.method_map +# anymore... 2013-10-15 --isis

1 0

[bridgedb/master] Fix exclude_package_data param in setuptools.setup().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit f7a84000817422eb0a3aef20fc2ba93bede31e4b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 04:50:59 2013 +0000 Fix exclude_package_data param in setuptools.setup(). * CHANGE ``exclude_package_data`` to specify the package explicitly. This seems to fix a bug where .po files were still being installed. * ADD an exclusion for all .pot files. * FIXES a bug where lib/bridgedb/i18n/templates/bridgedb.pot was being installed by setuptools. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c4259fe..73f1be2 100644 --- a/setup.py +++ b/setup.py @@ -279,7 +279,7 @@ setuptools.setup( include_package_data=True, install_requires=get_requirements(), package_data={'bridgedb': get_data_files(filesonly=True)}, - exclude_package_data={'': ['*.po']}, + exclude_package_data={'bridgedb': ['*.po', '*.pot']}, message_extractors = {'lib/bridgedb': [ ('**.py', 'python', None), ('templates/**.html', 'mako', None),

1 0

[bridgedb/master] Rewrite the package_data param to setuptools.setup() to use get_data_files().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit a95e1894320ac43bf117d68021767e51a1037f39 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 04:38:52 2013 +0000 Rewrite the package_data param to setuptools.setup() to use get_data_files(). --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index b3cbb70..c4259fe 100644 --- a/setup.py +++ b/setup.py @@ -278,9 +278,7 @@ setuptools.setup( cmdclass=get_cmdclass(), include_package_data=True, install_requires=get_requirements(), - package_data={'bridgedb': ['i18n/*/LC_MESSAGES/*.mo', - 'templates/*.html', - 'templates/assets/*']}, + package_data={'bridgedb': get_data_files(filesonly=True)}, exclude_package_data={'': ['*.po']}, message_extractors = {'lib/bridgedb': [ ('**.py', 'python', None),

1 0

[bridgedb/master] Remove installData class and all distutils references from setup.py.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit f2c6205207178e2814213c067d346ab21226d05f Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 04:58:28 2013 +0000 Remove installData class and all distutils references from setup.py. * FIXES all the distutils hellspawn bugs arising from the disturbed grave of distribute. Everything is purely setuptools now. --- setup.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/setup.py b/setup.py index e710fe5..c7bb271 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ from __future__ import print_function -from distutils.command.install_data import install_data as _install_data import os import setuptools import sys @@ -88,7 +87,7 @@ def get_cmdclass(): 'extract_messages': extract_messages, 'init_catalog': init_catalog, 'update_catalog': update_catalog, - 'install_data': installData} + } cmdclass.update(versioneer.get_cmdclass()) return cmdclass @@ -220,18 +219,6 @@ def get_data_files(filesonly=False): return data_files -class installData(_install_data): - def run(self): - self.data_files = get_data_files() - for lang in os.listdir('build/locale/'): - if lang.endswith('templates'): - continue - lang_dir = os.path.join('share', 'locale', lang, 'LC_MESSAGES') - lang_file = os.path.join('build', 'locale', lang, 'LC_MESSAGES', - 'bridgedb.mo') - self.data_files.append( (lang_dir, [lang_file]) ) - _install_data.run(self) - class runTests(setuptools.Command): # Based on setup.py from mixminion, which is based on setup.py # from Zooko's pyutil package, which is in turn based on

1 0

[bridgedb/master] Remove subprocess import from setup.py; it wasn't used anywhere.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit db198d2f1b0e0013454090719630ec54f7758077 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 04:55:42 2013 +0000 Remove subprocess import from setup.py; it wasn't used anywhere. --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index b231dbd..e710fe5 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ from __future__ import print_function -import subprocess from distutils.command.install_data import install_data as _install_data import os import setuptools

1 0

[bridgedb/master] Change 'install' and 'force_install' Makefile directive to be verbose again.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 3654527f80d4b2efb2ecf7e41082fa515e776b2c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 05:05:34 2013 +0000 Change 'install' and 'force_install' Makefile directive to be verbose again. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b932701..43dfa38 100644 --- a/Makefile +++ b/Makefile @@ -9,12 +9,12 @@ test: python setup.py test install: - -python setup.py compile_catalog 2>&1 >/dev/null + -python setup.py compile_catalog python setup.py install --record installed-files.txt force-install: - -python setup.py compile_catalog 2>&1 >/dev/null - python setup.py install --force --record installed-files.txt 2>&1 >/dev/null + -python setup.py compile_catalog + python setup.py install --force --record installed-files.txt uninstall: touch installed-files.txt

1 0

[bridgedb/master] Merge branch 'hotfix/9959-pas-danglais_install-data' into develop
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 850b5c8313d1c288386130be2c8bc1bec90acd6e Merge: 6875e46 3654527 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 05:54:59 2013 +0000 Merge branch 'hotfix/9959-pas-danglais_install-data' into develop .gitignore | 4 + Makefile | 6 +- lib/bridgedb/__init__.py | 16 +++- lib/bridgedb/_langs.py | 24 ++++++ setup.py | 183 +++++++++++++++++++++++++++++++++++++--------- 5 files changed, 194 insertions(+), 39 deletions(-)

1 0

[bridgedb/master] Add a download_url to setuptools.setup(). While we're at it, why not?
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 1c475dc17b92dcafe16105c419284b8c684caa48 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 05:03:29 2013 +0000 Add a download_url to setuptools.setup(). While we're at it, why not? --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 6f5868a..731a22e 100644 --- a/setup.py +++ b/setup.py @@ -253,6 +253,7 @@ setuptools.setup( maintainer='Isis Agora Lovecruft', maintainer_email='isis(a)torproject.org 0xA3ADB67A2CDB8B35', url='https://www.torproject.org', + download_url='https://gitweb.torproject.org/bridgedb.git', package_dir={'': 'lib'}, packages=['bridgedb'], scripts=['scripts/bridgedb',

1 0

[bridgedb/master] Some pep8ification on setup.py.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit faefd0492416754ea8f1c1972022324e5ea2f688 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 05:02:49 2013 +0000 Some pep8ification on setup.py. --- setup.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index c7bb271..6f5868a 100644 --- a/setup.py +++ b/setup.py @@ -82,12 +82,11 @@ def get_cmdclass(): to add our own classes to the cmdclass dictionary, and then update that dictionary with the one returned from versioneer.get_cmdclass(). """ - cmdclass={'test' : runTests, - 'compile_catalog': compile_catalog, - 'extract_messages': extract_messages, - 'init_catalog': init_catalog, - 'update_catalog': update_catalog, - } + cmdclass = {'test': runTests, + 'compile_catalog': compile_catalog, + 'extract_messages': extract_messages, + 'init_catalog': init_catalog, + 'update_catalog': update_catalog} cmdclass.update(versioneer.get_cmdclass()) return cmdclass @@ -237,7 +236,7 @@ class runTests(setuptools.Command): def run(self): self.run_command('build') old_path = sys.path[:] - sys.path[0:0] = [ self.build_purelib, self.build_platlib ] + sys.path[0:0] = [self.build_purelib, self.build_platlib] try: testmod = __import__("bridgedb.Tests", globals(), "", []) testmod.Tests.main() @@ -254,7 +253,7 @@ setuptools.setup( maintainer='Isis Agora Lovecruft', maintainer_email='isis(a)torproject.org 0xA3ADB67A2CDB8B35', url='https://www.torproject.org', - package_dir= {'' : 'lib'}, + package_dir={'': 'lib'}, packages=['bridgedb'], scripts=['scripts/bridgedb', 'scripts/gen_bridge_descriptors'],

1 0