Start renaming, re-ordering folder/module structure.
We now have something like that: - / -- src/ --------- olympia/ -------------- {access,accounts,amo,addons,...} -------------- wsgi.py -------------- urls.py -------------- migrations/ -------------- libs/ ... Which generally feels more django-like again and makes porting our sys.path hacks to django 1.7 and it's app-refactoring a lot easier. * Update setup.py to bring it to a more modern format * Update gitignore
This commit is contained in:
Родитель
522c490031
Коммит
580de6f78e
|
@ -10,15 +10,15 @@ shellng_local.py
|
|||
pip-log.txt
|
||||
docs/_gh-pages
|
||||
docs/api/_build
|
||||
lib/product_json/.gitignore
|
||||
lib/product_json/*.json
|
||||
lib/product_json/.last_update
|
||||
lib/product_json/regions/*.json
|
||||
lib/product_json/regions/.last_update
|
||||
olympia/lib/product_json/.gitignore
|
||||
olympia/lib/product_json/*.json
|
||||
olympia/lib/product_json/.last_update
|
||||
olympia/lib/product_json/regions/*.json
|
||||
olympia/lib/product_json/regions/.last_update
|
||||
build*.py
|
||||
media/build_id.txt
|
||||
media/manifest.appcache
|
||||
media/external/*
|
||||
web/media/build_id.txt
|
||||
web/media/manifest.appcache
|
||||
web/media/external/*
|
||||
.DS_Store
|
||||
.idea
|
||||
/media/img/uploads
|
||||
|
@ -41,10 +41,10 @@ vagrant/manifests/classes/custom.pp
|
|||
node_modules
|
||||
.npm/
|
||||
commonplace_projects
|
||||
media/fireplace
|
||||
media/rocketfuel
|
||||
media/commbadge
|
||||
media/marketplace-stats
|
||||
web/media/fireplace
|
||||
web/media/rocketfuel
|
||||
web/media/commbadge
|
||||
web/media/marketplace-stats
|
||||
*.signed.zip
|
||||
*.po~
|
||||
site-static/*
|
||||
|
|
|
@ -7,10 +7,10 @@ import caching
|
|||
import pytest
|
||||
from multidb import pinning
|
||||
|
||||
import amo
|
||||
from access.models import Group, GroupUser
|
||||
from translations.hold import clean_translations
|
||||
from users.models import UserProfile
|
||||
from olympia import amo
|
||||
from olympia.access.models import Group, GroupUser
|
||||
from olympia.translations.hold import clean_translations
|
||||
from olympia.users.models import UserProfile
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
|
|
|
@ -1,11 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
import sys
|
||||
|
||||
# This needs to be imported so it can perform path adjustments necessary for
|
||||
# management command discovery, since that's one of the very few Django
|
||||
# functions that doesn't import all apps.
|
||||
import olympia # noqa
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
from django.core.management import execute_from_command_line
|
||||
|
|
46
setup.py
46
setup.py
|
@ -1,20 +1,32 @@
|
|||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
import os
|
||||
import codecs
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
from distutils.core import setup
|
||||
|
||||
setup(name='Olympia',
|
||||
version='0.1dev',
|
||||
description='This is https://addons.mozilla.org (AMO)',
|
||||
author='The Mozilla Team',
|
||||
author_email='amo-developers@mozilla.org',
|
||||
url='https://addons.mozilla.org/',
|
||||
packages=['apps', 'lib'],
|
||||
classifiers=[
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Environment :: Web Environment',
|
||||
'Intended Audience :: End Users/Desktop',
|
||||
'License :: OSI Approved :: Mozilla Public License',
|
||||
'Operating System :: POSIX',
|
||||
'Programming Language :: Python',
|
||||
'Topic :: Internet :: WWW/HTTP :: Browsers',
|
||||
])
|
||||
setup(
|
||||
name='olympia',
|
||||
version='0.1.0',
|
||||
description='This is https://addons.mozilla.org (AMO)',
|
||||
author='The Mozilla Team',
|
||||
author_email='amo-developers@mozilla.org',
|
||||
url='https://addons.mozilla.org/',
|
||||
package_dir={'': 'src'},
|
||||
packages=find_packages('src'),
|
||||
include_package_data=True,
|
||||
test_suite='.',
|
||||
zip_safe=False,
|
||||
classifiers=[
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Environment :: Web Environment',
|
||||
'Intended Audience :: End Users/Desktop',
|
||||
'License :: OSI Approved :: Mozilla Public License',
|
||||
'Operating System :: POSIX',
|
||||
'Programming Language :: Python',
|
||||
'Framework :: Django',
|
||||
'Topic :: Internet :: WWW/HTTP :: Browsers',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
],
|
||||
)
|
||||
|
|
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче