Merge branch 'master' into long_desc

This commit is contained in:
Jacob Kaplan-Moss 2019-12-25 10:52:28 -05:00 committed by GitHub
commit 7546ed77e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 75 additions and 33 deletions

40
.github/workflows/test.yml vendored Normal file
View file

@ -0,0 +1,40 @@
name: test
on: [push]
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
django-version: [1.11, 2.0, 2.1, 2.2, 3.0]
exclude:
# Python 2.7 is only compatible with Django 1.11
- python-version: 2.7
django-version: 2.0
- python-version: 2.7
django-version: 2.1
- python-version: 2.7
django-version: 2.2
- python-version: 2.7
django-version: 3.0
# Python 3.5 is compatible with Django 1.11 to 2.2 but not 3.0
- python-version: 3.5
django-version: 3.0
fail-fast: false
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
pip install -U pip
pip install "Django~=${{ matrix.django-version }}.0" .
- name: Run Tests
run: |
echo "$(python --version) / Django $(django-admin --version)"
python -m unittest discover

1
.gitignore vendored
View file

@ -53,3 +53,4 @@ docs/_build/
# Virtualenv
env/
.vscode/

View file

@ -1,2 +0,0 @@
test:
python test_dj_database_url.py

View file

@ -1,8 +1,8 @@
DJ-Database-URL
~~~~~~~~~~~~~~~
.. image:: https://secure.travis-ci.org/jacobian/dj-database-url.svg?branch=master
:target: http://travis-ci.org/jacobian/dj-database-url
.. image:: https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fjacobian%2Fdj-database-url%2Fbadge&style=for-the-badge
:target: https://actions-badge.atrox.dev/jacobian/dj-database-url/goto
This simple Django utility allows you to utilize the
`12factor <http://www.12factor.net/backing-services>`_ inspired

View file

@ -5,37 +5,40 @@ with open('README.rst') as readme_rst:
readme = readme_rst.read()
setup(
name='dj-database-url',
version='0.5.0',
url='https://github.com/kennethreitz/dj-database-url',
license='BSD',
author='Kenneth Reitz',
author_email='me@kennethreitz.com',
description='Use Database URLs in your Django Application.',
name="dj-database-url",
version="0.5.0",
url="https://github.com/jacobian/dj-database-url",
license="BSD",
author="Kenneth Reitz",
author_email="me@kennethreitz.com",
description="Use Database URLs in your Django Application.",
long_description=readme,
py_modules=['dj_database_url'],
py_modules=["dj_database_url"],
install_requires=["Django>1.11"],
zip_safe=False,
include_package_data=True,
platforms='any',
platforms="any",
classifiers=[
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Software Development :: Libraries :: Python Modules',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
]
"Environment :: Web Environment",
"Framework :: Django",
"Framework :: Django :: 1.11",
"Framework :: Django :: 2.0",
"Framework :: Django :: 2.1",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.0",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Software Development :: Libraries :: Python Modules",
"Programming Language :: Python",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
],
)