Skip to content

Commit

Permalink
Merge d563f37 into 662066e
Browse files Browse the repository at this point in the history
  • Loading branch information
matijakolaric committed Dec 3, 2018
2 parents 662066e + d563f37 commit 2dc951b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 20 deletions.
26 changes: 12 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
language: python
matrix:
include:
- python: "3.5"
env: DJANGO_VERSION=2.0.9 DATABASE_URL="sqlite:///db.sqlite3"
- python: "3.5"
env: DJANGO_VERSION=2.1.2 DATABASE_URL="postgres://postgres@localhost/dmp"
- name: "Py3.5 PostgreSQL9.4"
python: "3.5"
addons:
postgresql: "9.4"
- python: "3.6"
env: DJANGO_VERSION=2.1.2 DATABASE_URL="sqlite:///db.sqlite3"
- python: "3.6"
env: DJANGO_VERSION=2.0.9 DATABASE_URL="postgres://postgres@localhost/dmp" WORK_ID_PREFIX="XXX"
- python: "3.6"
env: DJANGO_VERSION=2.1.2 DATABASE_URL="postgres://postgres@localhost/dmp"
env: DATABASE_URL="postgres://postgres@localhost/dmp"
- name: "Py3.6 SQLite3"
python: "3.6"
env: DATABASE_URL="sqlite:///db.sqlite3"
- name: "Py3.6 PostgreSQL9.5 XXX"
python: "3.6"
env: DATABASE_URL="postgres://postgres@localhost/dmp" WORK_ID_PREFIX="XXX"
addons:
postgresql: "9.5"
- python: "3.7-dev"
env: DJANGO_VERSION=2.1.2 DATABASE_URL="postgres://postgres@localhost/dmp"
- name: "Py3.7 PostgreSQL9.6"
python: "3.7-dev"
env: DATABASE_URL="postgres://postgres@localhost/dmp"
addons:
postgresql: "9.6"
# command to install dependencies
install:
- pip install -r requirements.txt
- pip install -U Django==$DJANGO_VERSION
# command to run tests
script:
- coverage run --source='music_publisher' manage.py test
after_success: coveralls
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Django Music Publisher is an open source software for original music publishers.

.. image:: images/add_work.png

* Docs: https://django-music-publisher.readthedocs.io/en/latest/
* Docs: https://django-music-publisher.readthedocs.io/en/stable/
* Code: https://github.com/matijakolaric-com/django-music-publisher/
* PYPI: https://pypi.org/project/django-music-publisher/
* Home: https://matijakolaric.com/articles/2/
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ certifi==2018.4.16
chardet==3.0.4
coverage==4.5.1
coveralls==1.3.0
Django>=2.1.3
Django>=2.1.4
dj_database_url
idna==2.7
psycopg2-binary
Expand Down
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,24 @@

setuptools.setup(
name='django-music-publisher',
version='18.11rc1',
version='18.11',
author='Matija Kolarić',
author_email='i@matijakolaric.com',
license='MIT License',
description='Django App for Music Publishers',
long_description=long_description,
long_description_content_type='text/x-rst',
url='https://django-music-publisher.readthedocs.io/en/latest/',
url='https://django-music-publisher.readthedocs.io/en/stable/',
packages=setuptools.find_packages(exclude=['dmp_project', 'docs']),
install_requires=(
'Django>=2.0.9',
'Django>=2.1.4',
'requests>=2.20.0',
),
include_package_data=True,
classifiers=(
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
Expand Down

0 comments on commit 2dc951b

Please sign in to comment.