From 2f98d9d9a4a37b45bc93da1be68a649b169bc04a Mon Sep 17 00:00:00 2001 From: kiorky Date: Thu, 15 Nov 2012 19:15:24 +0100 Subject: [PATCH] rearrange distribution more cleanly --- CHANGES.rst | 7 + CHANGES.txt | 4 - MANIFEST.in | 10 +- README.md | 59 ---- README.rst | 78 ++++++ bootstrap.py | 258 ++++++++++++++++++ convertit/tests/converters/__init__.py | 0 setup.py | 45 ++- {convertit => src/convertit}/__init__.py | 0 .../convertit}/converters/__init__.py | 0 .../convertit}/converters/inkscape.py | 0 .../convertit}/converters/unoconv.py | 0 {convertit => src/convertit}/helpers.py | 0 .../convertit}/static/favicon.ico | Bin .../convertit}/static/footerbg.png | Bin .../convertit}/static/headerbg.png | Bin {convertit => src/convertit}/static/ie6.css | 0 .../convertit}/static/middlebg.png | Bin .../convertit}/static/pylons.css | 0 .../convertit}/static/pyramid-small.png | Bin .../convertit}/static/pyramid.png | Bin .../convertit}/static/transparent.gif | Bin .../convertit}/templates/mytemplate.pt | 0 .../convertit}/tests/__init__.py | 0 .../convertit}/tests/data/test_document.odt | Bin .../convertit}/tests/data/test_document.pdf | Bin .../convertit}/tests/data/test_svg.pdf | Bin .../convertit}/tests/data/test_svg.svg | 0 .../convertit}/tests/test_functional.py | 0 .../convertit}/tests/test_helpers.py | 4 +- .../convertit/tests}/test_inkscape.py | 6 +- .../convertit/tests}/test_unoconv.py | 6 +- {convertit => src/convertit}/views.py | 0 33 files changed, 394 insertions(+), 83 deletions(-) create mode 100644 CHANGES.rst delete mode 100644 CHANGES.txt delete mode 100644 README.md create mode 100644 README.rst create mode 100644 bootstrap.py delete mode 100644 convertit/tests/converters/__init__.py rename {convertit => src/convertit}/__init__.py (100%) rename {convertit => src/convertit}/converters/__init__.py (100%) rename {convertit => src/convertit}/converters/inkscape.py (100%) rename {convertit => src/convertit}/converters/unoconv.py (100%) rename {convertit => src/convertit}/helpers.py (100%) rename {convertit => src/convertit}/static/favicon.ico (100%) rename {convertit => src/convertit}/static/footerbg.png (100%) rename {convertit => src/convertit}/static/headerbg.png (100%) rename {convertit => src/convertit}/static/ie6.css (100%) rename {convertit => src/convertit}/static/middlebg.png (100%) rename {convertit => src/convertit}/static/pylons.css (100%) rename {convertit => src/convertit}/static/pyramid-small.png (100%) rename {convertit => src/convertit}/static/pyramid.png (100%) rename {convertit => src/convertit}/static/transparent.gif (100%) rename {convertit => src/convertit}/templates/mytemplate.pt (100%) rename {convertit => src/convertit}/tests/__init__.py (100%) rename {convertit => src/convertit}/tests/data/test_document.odt (100%) rename {convertit => src/convertit}/tests/data/test_document.pdf (100%) rename {convertit => src/convertit}/tests/data/test_svg.pdf (100%) rename {convertit => src/convertit}/tests/data/test_svg.svg (100%) rename {convertit => src/convertit}/tests/test_functional.py (100%) rename {convertit => src/convertit}/tests/test_helpers.py (99%) rename {convertit/tests/converters => src/convertit/tests}/test_inkscape.py (88%) rename {convertit/tests/converters => src/convertit/tests}/test_unoconv.py (88%) rename {convertit => src/convertit}/views.py (100%) diff --git a/CHANGES.rst b/CHANGES.rst new file mode 100644 index 0000000..8245ce7 --- /dev/null +++ b/CHANGES.rst @@ -0,0 +1,7 @@ +Changelog +============= + +0.0 (unreleased) +----------------- + +- Initial version diff --git a/CHANGES.txt b/CHANGES.txt deleted file mode 100644 index 35a34f3..0000000 --- a/CHANGES.txt +++ /dev/null @@ -1,4 +0,0 @@ -0.0 ---- - -- Initial version diff --git a/MANIFEST.in b/MANIFEST.in index 06c4849..ae70850 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,8 @@ -include *.txt *.ini *.cfg *.rst -recursive-include convertit *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml +include *.txt *.ini *.cfg *.rst *.in +exclude .installed.cfg a.cfg .mr* local.cfg +recursive-include src *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml +recursive-include etc * +recursive-exclude etc/init.d * +recursive-exclude etc/apache 100-* +recursive-exclude etc/wsgi * +recursive-exclude etc *.env diff --git a/README.md b/README.md deleted file mode 100644 index d644c96..0000000 --- a/README.md +++ /dev/null @@ -1,59 +0,0 @@ -Convertit -========= - -A conversion webservice. - -Authors -======== - - * Antoine Cezar - * Alex Marandon - -Feedback -======== - -Open an [Issue](https://github.com/makinacorpus/convertit/issues) to report a bug or request a new feature. - -Dependencies -============ - - * for OpenDocument support: unoconv - * for SVG support: inkscape - -Install -======= - - * Throught regular easy_install / buildout: - - ``` - easy_install convertit - ``` - - * The bleeding edge version is hosted on github: - - ``` - git clone https://github.com/makinacorpus/convertit.git - cd convertit - python setup.py install - ``` - -Development -=========== - -``` -git clone https://github.com/makinacorpus/convertit.git -cd convertit -python setup.py develop -python setup.py test -pserve development.ini --reload -``` - -Once the application is running, you may visit http://localhost:6543/ in your browser. - ---- -![Makina Corpus Logo](http://depot.makina-corpus.org/public/logo.gif "Makina Corpus") - -Convertit is a [Makina Corpus](http://www.makina-corpus.com) project. - - * [Blog](http://www.makina-corpus.org) - * [Contact](mailto:python@makina-corpus.org) diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..807611c --- /dev/null +++ b/README.rst @@ -0,0 +1,78 @@ +Convertit +========= + +A conversion webservice. + +.. contents:: + +Feedback +======== + +Open an `Issue `_ to report a bug or request a new feature. + +Dependencies +============ +* for OpenDocument support: unoconv +* for SVG support: inkscape + +Install +======= +* Download and extract a released tarball from `pypi `_ +* The bleeding edge version is hosted on github :: + + git clone https://github.com/makinacorpus/convertit.git + +* PreInstall it :: + + cd convertit + python bootstrap.py -dc buildout-dev.cfg + + +Development +============ +:: + cd convertit + bin/buildout -Nc buildout-dev.cfg + pserve --reload etc/wsgi/instance.ini + bin/scripts setup.py test + +Once the application is running, you may visit http://localhost:6543/ in your browser. + +Production +=========== +:: + cd convertit + bin/buildout -Nc buildout-prod.cfg + bin/supervisord + bin/supervisorctl status + + +Some files have been generated in etc/ for your convenience: + + * An init script + * A logrotate configuration + * An Apache vhost sample + + +Credits +======== +Companies +--------- +|makinacom|_ + + * `Planet Makina Corpus `_ + * `Contact us `_ + +.. |makinacom| image:: http://depot.makina-corpus.org/public/logo.gif +.. _makinacom: http://www.makina-corpus.com + +Authors +------------ +* Antoine Cezar +* Alex Marandon + +Contributors +----------------- +* kiorky + + diff --git a/bootstrap.py b/bootstrap.py new file mode 100644 index 0000000..a3d5b92 --- /dev/null +++ b/bootstrap.py @@ -0,0 +1,258 @@ +############################################################################## +# +# Copyright (c) 2006 Zope Foundation and Contributors. +# All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# +############################################################################## +"""Bootstrap a buildout-based project + +Simply run this script in a directory containing a buildout.cfg. +The script accepts buildout command-line options, so you can +use the -c option to specify an alternate configuration file. +""" + +import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess +from optparse import OptionParser + +if sys.platform == 'win32': + def quote(c): + if ' ' in c: + return '"%s"' % c # work around spawn lamosity on windows + else: + return c +else: + quote = str + +# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments. +stdout, stderr = subprocess.Popen( + [sys.executable, '-Sc', + 'try:\n' + ' import ConfigParser\n' + 'except ImportError:\n' + ' print 1\n' + 'else:\n' + ' print 0\n'], + stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate() +has_broken_dash_S = bool(int(stdout.strip())) + +# In order to be more robust in the face of system Pythons, we want to +# run without site-packages loaded. This is somewhat tricky, in +# particular because Python 2.6's distutils imports site, so starting +# with the -S flag is not sufficient. However, we'll start with that: +if not has_broken_dash_S and 'site' in sys.modules: + # We will restart with python -S. + args = sys.argv[:] + args[0:0] = [sys.executable, '-S'] + args = map(quote, args) + os.execv(sys.executable, args) +# Now we are running with -S. We'll get the clean sys.path, import site +# because distutils will do it later, and then reset the path and clean +# out any namespace packages from site-packages that might have been +# loaded by .pth files. +clean_path = sys.path[:] +import site +sys.path[:] = clean_path +for k, v in sys.modules.items(): + if (hasattr(v, '__path__') and + len(v.__path__)==1 and + not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))): + # This is a namespace package. Remove it. + sys.modules.pop(k) + +is_jython = sys.platform.startswith('java') + +setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py' +distribute_source = 'http://python-distribute.org/distribute_setup.py' + +# parsing arguments +def normalize_to_url(option, opt_str, value, parser): + if value: + if '://' not in value: # It doesn't smell like a URL. + value = 'file://%s' % ( + urllib.pathname2url( + os.path.abspath(os.path.expanduser(value))),) + if opt_str == '--download-base' and not value.endswith('/'): + # Download base needs a trailing slash to make the world happy. + value += '/' + else: + value = None + name = opt_str[2:].replace('-', '_') + setattr(parser.values, name, value) + +usage = '''\ +[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] + +Bootstraps a buildout-based project. + +Simply run this script in a directory containing a buildout.cfg, using the +Python that you want bin/buildout to use. + +Note that by using --setup-source and --download-base to point to +local resources, you can keep this script from going over the network. +''' + +parser = OptionParser(usage=usage) +parser.add_option("-v", "--version", dest="version", + help="use a specific zc.buildout version") +parser.add_option("-d", "--distribute", + action="store_true", dest="use_distribute", default=False, + help="Use Distribute rather than Setuptools.") +parser.add_option("--setup-source", action="callback", dest="setup_source", + callback=normalize_to_url, nargs=1, type="string", + help=("Specify a URL or file location for the setup file. " + "If you use Setuptools, this will default to " + + setuptools_source + "; if you use Distribute, this " + "will default to " + distribute_source +".")) +parser.add_option("--download-base", action="callback", dest="download_base", + callback=normalize_to_url, nargs=1, type="string", + help=("Specify a URL or directory for downloading " + "zc.buildout and either Setuptools or Distribute. " + "Defaults to PyPI.")) +parser.add_option("--eggs", + help=("Specify a directory for storing eggs. Defaults to " + "a temporary directory that is deleted when the " + "bootstrap script completes.")) +parser.add_option("-t", "--accept-buildout-test-releases", + dest='accept_buildout_test_releases', + action="store_true", default=False, + help=("Normally, if you do not specify a --version, the " + "bootstrap script and buildout gets the newest " + "*final* versions of zc.buildout and its recipes and " + "extensions for you. If you use this flag, " + "bootstrap and buildout will get the newest releases " + "even if they are alphas or betas.")) +parser.add_option("-c", None, action="store", dest="config_file", + help=("Specify the path to the buildout configuration " + "file to be used.")) + +options, args = parser.parse_args() + +# if -c was provided, we push it back into args for buildout's main function +if options.config_file is not None: + args += ['-c', options.config_file] + +if options.eggs: + eggs_dir = os.path.abspath(os.path.expanduser(options.eggs)) +else: + eggs_dir = tempfile.mkdtemp() + +if options.setup_source is None: + if options.use_distribute: + options.setup_source = distribute_source + else: + options.setup_source = setuptools_source + +if options.accept_buildout_test_releases: + args.append('buildout:accept-buildout-test-releases=true') +args.append('bootstrap') + +try: + import pkg_resources + import setuptools # A flag. Sometimes pkg_resources is installed alone. + if not hasattr(pkg_resources, '_distribute'): + raise ImportError +except ImportError: + ez_code = urllib2.urlopen( + options.setup_source).read().replace('\r\n', '\n') + ez = {} + exec ez_code in ez + setup_args = dict(to_dir=eggs_dir, download_delay=0) + if options.download_base: + setup_args['download_base'] = options.download_base + if options.use_distribute: + setup_args['no_fake'] = True + ez['use_setuptools'](**setup_args) + reload(sys.modules['pkg_resources']) + import pkg_resources + # This does not (always?) update the default working set. We will + # do it. + for path in sys.path: + if path not in pkg_resources.working_set.entries: + pkg_resources.working_set.add_entry(path) + +cmd = [quote(sys.executable), + '-c', + quote('from setuptools.command.easy_install import main; main()'), + '-mqNxd', + quote(eggs_dir)] + +if not has_broken_dash_S: + cmd.insert(1, '-S') + +find_links = options.download_base +if not find_links: + find_links = os.environ.get('bootstrap-testing-find-links') +if find_links: + cmd.extend(['-f', quote(find_links)]) + +if options.use_distribute: + setup_requirement = 'distribute' +else: + setup_requirement = 'setuptools' +ws = pkg_resources.working_set +setup_requirement_path = ws.find( + pkg_resources.Requirement.parse(setup_requirement)).location +env = dict( + os.environ, + PYTHONPATH=setup_requirement_path) + +requirement = 'zc.buildout' +version = options.version +if version is None and not options.accept_buildout_test_releases: + # Figure out the most recent final version of zc.buildout. + import setuptools.package_index + _final_parts = '*final-', '*final' + def _final_version(parsed_version): + for part in parsed_version: + if (part[:1] == '*') and (part not in _final_parts): + return False + return True + index = setuptools.package_index.PackageIndex( + search_path=[setup_requirement_path]) + if find_links: + index.add_find_links((find_links,)) + req = pkg_resources.Requirement.parse(requirement) + if index.obtain(req) is not None: + best = [] + bestv = None + for dist in index[req.project_name]: + distv = dist.parsed_version + if _final_version(distv): + if bestv is None or distv > bestv: + best = [dist] + bestv = distv + elif distv == bestv: + best.append(dist) + if best: + best.sort() + version = best[-1].version +if version: + requirement = '=='.join((requirement, version)) +cmd.append(requirement) + +if is_jython: + import subprocess + exitcode = subprocess.Popen(cmd, env=env).wait() +else: # Windows prefers this, apparently; otherwise we would prefer subprocess + exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env])) +if exitcode != 0: + sys.stdout.flush() + sys.stderr.flush() + print ("An error occurred when trying to install zc.buildout. " + "Look above this message for any errors that " + "were output by easy_install.") + sys.exit(exitcode) + +ws.add_entry(eggs_dir) +ws.require(requirement) +import zc.buildout.buildout +zc.buildout.buildout.main(args) +if not options.eggs: # clean up temporary egg directory + shutil.rmtree(eggs_dir) diff --git a/convertit/tests/converters/__init__.py b/convertit/tests/converters/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/setup.py b/setup.py index fef5d54..ea91479 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,48 @@ import os - from setuptools import setup, find_packages - -here = os.path.abspath(os.path.dirname(__file__)) -README = open(os.path.join(here, 'README.md')).read() -CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() - requires = [ + 'Paste', 'pyramid', 'pyramid_debugtoolbar', 'waitress', + 'sqlalchemy', + 'repoze.tm2', + 'cryptacular', + 'WebOb', + 'WebError', + 'repoze.vhm', + 'ipython', + 'bpython', ] test_requires = requires + [ 'webtest', + 'plone.testing', 'mock', 'coverage', + 'nose', + ] + + +def read(*rnames): + return open( + os.path.join('.', *rnames) + ).read() + + +long_description = "\n\n".join( + [read('README.rst'), + read('CHANGES.rst'), ] +) + + +version = '1.0dev0' setup(name='convertit', - version='0.0', + version=version, description='convertit', - long_description=README + '\n\n' + CHANGES, + long_description=long_description, license='AGPLV3', classifiers=[ "License :: OSI Approved :: GNU Affero General Public License v3", @@ -34,14 +55,18 @@ author_email='python@makina-corpus.org', url='https://github.com/makinacorpus/convertit', keywords='web pyramid webservice convert', - packages=find_packages(), + packages=find_packages('src'), + package_dir = {'': 'src'}, include_package_data=True, zip_safe=False, install_requires=requires, tests_require=test_requires, + extras_require = { + 'test': test_requires, + }, test_suite="convertit", entry_points="""\ [paste.app_factory] main = convertit:main """, - ) + ) diff --git a/convertit/__init__.py b/src/convertit/__init__.py similarity index 100% rename from convertit/__init__.py rename to src/convertit/__init__.py diff --git a/convertit/converters/__init__.py b/src/convertit/converters/__init__.py similarity index 100% rename from convertit/converters/__init__.py rename to src/convertit/converters/__init__.py diff --git a/convertit/converters/inkscape.py b/src/convertit/converters/inkscape.py similarity index 100% rename from convertit/converters/inkscape.py rename to src/convertit/converters/inkscape.py diff --git a/convertit/converters/unoconv.py b/src/convertit/converters/unoconv.py similarity index 100% rename from convertit/converters/unoconv.py rename to src/convertit/converters/unoconv.py diff --git a/convertit/helpers.py b/src/convertit/helpers.py similarity index 100% rename from convertit/helpers.py rename to src/convertit/helpers.py diff --git a/convertit/static/favicon.ico b/src/convertit/static/favicon.ico similarity index 100% rename from convertit/static/favicon.ico rename to src/convertit/static/favicon.ico diff --git a/convertit/static/footerbg.png b/src/convertit/static/footerbg.png similarity index 100% rename from convertit/static/footerbg.png rename to src/convertit/static/footerbg.png diff --git a/convertit/static/headerbg.png b/src/convertit/static/headerbg.png similarity index 100% rename from convertit/static/headerbg.png rename to src/convertit/static/headerbg.png diff --git a/convertit/static/ie6.css b/src/convertit/static/ie6.css similarity index 100% rename from convertit/static/ie6.css rename to src/convertit/static/ie6.css diff --git a/convertit/static/middlebg.png b/src/convertit/static/middlebg.png similarity index 100% rename from convertit/static/middlebg.png rename to src/convertit/static/middlebg.png diff --git a/convertit/static/pylons.css b/src/convertit/static/pylons.css similarity index 100% rename from convertit/static/pylons.css rename to src/convertit/static/pylons.css diff --git a/convertit/static/pyramid-small.png b/src/convertit/static/pyramid-small.png similarity index 100% rename from convertit/static/pyramid-small.png rename to src/convertit/static/pyramid-small.png diff --git a/convertit/static/pyramid.png b/src/convertit/static/pyramid.png similarity index 100% rename from convertit/static/pyramid.png rename to src/convertit/static/pyramid.png diff --git a/convertit/static/transparent.gif b/src/convertit/static/transparent.gif similarity index 100% rename from convertit/static/transparent.gif rename to src/convertit/static/transparent.gif diff --git a/convertit/templates/mytemplate.pt b/src/convertit/templates/mytemplate.pt similarity index 100% rename from convertit/templates/mytemplate.pt rename to src/convertit/templates/mytemplate.pt diff --git a/convertit/tests/__init__.py b/src/convertit/tests/__init__.py similarity index 100% rename from convertit/tests/__init__.py rename to src/convertit/tests/__init__.py diff --git a/convertit/tests/data/test_document.odt b/src/convertit/tests/data/test_document.odt similarity index 100% rename from convertit/tests/data/test_document.odt rename to src/convertit/tests/data/test_document.odt diff --git a/convertit/tests/data/test_document.pdf b/src/convertit/tests/data/test_document.pdf similarity index 100% rename from convertit/tests/data/test_document.pdf rename to src/convertit/tests/data/test_document.pdf diff --git a/convertit/tests/data/test_svg.pdf b/src/convertit/tests/data/test_svg.pdf similarity index 100% rename from convertit/tests/data/test_svg.pdf rename to src/convertit/tests/data/test_svg.pdf diff --git a/convertit/tests/data/test_svg.svg b/src/convertit/tests/data/test_svg.svg similarity index 100% rename from convertit/tests/data/test_svg.svg rename to src/convertit/tests/data/test_svg.svg diff --git a/convertit/tests/test_functional.py b/src/convertit/tests/test_functional.py similarity index 100% rename from convertit/tests/test_functional.py rename to src/convertit/tests/test_functional.py diff --git a/convertit/tests/test_helpers.py b/src/convertit/tests/test_helpers.py similarity index 99% rename from convertit/tests/test_helpers.py rename to src/convertit/tests/test_helpers.py index 1d52502..22ffb3b 100644 --- a/convertit/tests/test_helpers.py +++ b/src/convertit/tests/test_helpers.py @@ -37,7 +37,7 @@ def test_outdated_file_is_removed(self, listdir_mock, getmtime_mock, datetime_mo datetime_mock.return_value = datetime.fromtimestamp(1348418372.0) remove_files_older_than(60, 'fake/path') - + remove_mock.assert_called_with('fake/path/foo') @patch('os.remove') @@ -50,5 +50,5 @@ def test_not_outdated_file_is_removed(self, listdir_mock, getmtime_mock, datetim datetime_mock.return_value = datetime.fromtimestamp(1336858529.0) remove_files_older_than(60, 'fake/path') - + remove_mock.assert_not_called() diff --git a/convertit/tests/converters/test_inkscape.py b/src/convertit/tests/test_inkscape.py similarity index 88% rename from convertit/tests/converters/test_inkscape.py rename to src/convertit/tests/test_inkscape.py index fd77c6d..2515e3e 100644 --- a/convertit/tests/converters/test_inkscape.py +++ b/src/convertit/tests/test_inkscape.py @@ -28,9 +28,9 @@ def test_not_registered_when_inkscape_not_exists(self, exists_mock): class InkscapeConvertionTests(unittest.TestCase): - temp_dir = os.path.join(here, '../data/tmp') - document_filepath = os.path.join(here, '../data/test_svg.svg') - reference_filepath = os.path.join(here, '../data/test_svg.pdf') + temp_dir = os.path.join(here, 'data/tmp') + document_filepath = os.path.join(here, 'data/test_svg.svg') + reference_filepath = os.path.join(here, 'data/test_svg.pdf') def setUp(self): if not inkscape.exists(): diff --git a/convertit/tests/converters/test_unoconv.py b/src/convertit/tests/test_unoconv.py similarity index 88% rename from convertit/tests/converters/test_unoconv.py rename to src/convertit/tests/test_unoconv.py index b4db0a0..6e4d3b3 100644 --- a/convertit/tests/converters/test_unoconv.py +++ b/src/convertit/tests/test_unoconv.py @@ -27,9 +27,9 @@ def test_not_registered_when_unoconv_not_exists(self, exists_mock): class UnoconvConvertionTests(unittest.TestCase): - temp_dir = os.path.join(here, '../data/tmp') - document_filepath = os.path.join(here, '../data/test_document.odt') - reference_filepath = os.path.join(here, '../data/test_document.pdf') + temp_dir = os.path.join(here, 'data/tmp') + document_filepath = os.path.join(here, 'data/test_document.odt') + reference_filepath = os.path.join(here, 'data/test_document.pdf') def setUp(self): if not unoconv.exists(): diff --git a/convertit/views.py b/src/convertit/views.py similarity index 100% rename from convertit/views.py rename to src/convertit/views.py