Skip to content

Commit 8feb309

Browse files
authored
Merge pull request #46 from tumb1er/add_django_to_requirements
Add django to requirements
2 parents f98206e + 4338825 commit 8feb309

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

Diff for: .github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
max-parallel: 4
1010
matrix:
1111
python-version: [3.6, 3.7, 3.8]
12-
django-version: [2.2, 3.0]
12+
django-version: [2.2, 3.0, 3.1]
1313

1414
steps:
1515
- uses: actions/checkout@v2
@@ -21,8 +21,8 @@ jobs:
2121
run: |
2222
python -m pip install --upgrade pip
2323
echo "Python ${{ matrix.python-version }} -> Django ${{ matrix.django-version }}"
24-
sed -i '/Django==.*/d' ./requires.txt # delete django dependency
25-
pip install -r requires.txt
24+
sed -i '/Django==.*/d' ./requirements.txt # delete django dependency
25+
pip install -r requirements.txt
2626
python -m pip install "Django~=${{ matrix.django-version }}.0"
2727
pip install -q -e .
2828
echo "Django: `django-admin --version`"

Diff for: .github/workflows/codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
python-version: 3.8
1212
- name: Generate coverage report
1313
run: |
14-
pip install -r requires.txt
14+
pip install -r requirements.txt
1515
pip install coverage
1616
pip install -q -e .
1717
coverage run manage.py test

Diff for: .pyup.yml

-2
This file was deleted.

Diff for: requires.txt renamed to requirements.txt

File renamed without changes.

Diff for: setup.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,16 @@ def get_version():
7070
author_email='[email protected]',
7171
description='Django application for image assets management',
7272
install_requires=[
73-
'Django',
74-
'Pillow',
75-
'django-bitfield',
73+
'Django>=2.2,<3.2',
74+
'Pillow~=7.0',
75+
'django-bitfield~=2.0',
7676
],
7777
classifiers=[
78-
'Development Status :: 1 - Planning',
78+
'Development Status :: 4 - Beta',
7979
'Environment :: Console',
8080
'Framework :: Django :: 2.2',
8181
'Framework :: Django :: 3.0',
82+
'Framework :: Django :: 3.1',
8283
'Operating System :: POSIX',
8384
'Programming Language :: Python :: 3.6',
8485
'Programming Language :: Python :: 3.7',

0 commit comments

Comments
 (0)