diff --git a/docs/changelog.md b/docs/changelog.md deleted file mode 100644 index 482da74..0000000 --- a/docs/changelog.md +++ /dev/null @@ -1,9 +0,0 @@ -# Changelog - -## 0.1 (in development) - -Features: - - * Created app from [ixc-app-template] - -[ixc-app-template]: https://github.com/ixc/ixc-app-template/ diff --git a/docs/contributing.md b/docs/contributing.md index 6c4fbbd..b3bcc15 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -6,7 +6,7 @@ Please follow these guidelines when making contributions to this app. Clone the repository and change directory: - $ git clone git@github.com:ixc/icekit-events.git + $ git clone git@github.com:ic-labs/icekit-events.git $ cd icekit-events You don't need to install the project to run tests. You just need `tox`: diff --git a/docs/index.md b/docs/index.md index ef5f4c8..31ffd9e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ TODO Install the app into your virtualenv: - (venv)$ pip install -e git+ssh://git@github.com/ixc/.git#egg= + (venv)$ pip install -e git+ssh://git@github.com/ic-labs/.git#egg= Update your settings module: diff --git a/icekit_events/static/icekit_events/bower.json b/icekit_events/static/icekit_events/bower.json index 8265d0d..b6fc639 100644 --- a/icekit_events/static/icekit_events/bower.json +++ b/icekit_events/static/icekit_events/bower.json @@ -1,7 +1,7 @@ { "name": "icekit_events", "version": "0.0.0", - "homepage": "https://github.com/ixc/icekit-events", + "homepage": "https://github.com/ic-labs/icekit-events", "authors": [ "Tai Lee " ], diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 6c3b6d8..0000000 --- a/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -# Forked, pre-release and private dependencies. - --e git+https://github.com/django-nose/django-nose.git#egg=django-nose --e git+https://github.com/ixc/django-dynamic-fixture.git#egg=django-dynamic-fixture --e git+https://github.com/ixc/django-timezone.git#egg=django-timezone --e git+ssh://git@github.com/ixc/django-icekit.git#egg=django-icekit diff --git a/setup.py b/setup.py index 2cad33a..e73f0c3 100644 --- a/setup.py +++ b/setup.py @@ -41,35 +41,31 @@ use_scm_version={'version_scheme': 'post-release'}, author='Interaction Consortium', author_email='studio@interaction.net.au', - url='https://github.com/ixc/icekit-events', + url='https://github.com/ic-labs/icekit-events', description='', long_description=locals().get('long_description', ''), license='MIT', packages=setuptools.find_packages(), include_package_data=True, install_requires=[ - 'coverage', 'Django<1.9', 'django-dynamic-fixture', 'django-icekit[publishing]', 'django-model-utils<2.4', # See: https://github.com/jp74/django-model-publisher/pull/26 - 'django-nose', 'django-polymorphic<0.8', # ICEKit Events is not yet compatible with API changes in 0.8+ 'django-polymorphic-tree', 'django-timezone', - 'django-webtest', 'mkdocs', - 'nose-progressive', 'python-dateutil', 'pytz', 'six', 'sqlparse', # Required for SQL migrations, apparently - 'WebTest', ], extras_require={ 'dev': ['ipdb', 'ipython'], 'fluentevent': ['django-fluent-contents'], 'postgres': ['psycopg2'], + 'test': ['coverage', 'django-nose', 'nose-progressive', 'django-webtest', 'WebTest'] }, setup_requires=['setuptools_scm'], ) diff --git a/tox.ini b/tox.ini index 68ac475..7228fa4 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,7 @@ basepython = py34: python3.4 deps = - -e{toxinidir}[postgres] - -r{toxinidir}/requirements.txt + -e{toxinidir}[test,postgres] django17: django>=1.7,<1.8 django18: django>=1.8,<1.9 py32: coverage==3.7.1