Skip to content

Commit 3e91b3f

Browse files
committed
Switch to pbr for releases
1 parent cba4758 commit 3e91b3f

File tree

8 files changed

+39
-41
lines changed

8 files changed

+39
-41
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ develop-eggs/
1313
dist/
1414
downloads/
1515
eggs/
16+
.eggs/
1617
lib/
1718
lib64/
1819
parts/

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ matrix:
3535
- env: TOXENV=qa
3636
python: '3.5'
3737
install:
38-
- pip install --upgrade pip tox
39-
- pip install -U codecov
38+
- pip install -qU pip tox codecov
4039
before_script:
4140
- mkdir bin
4241
- curl -O https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION}/chromedriver_linux64.zip

MANIFEST.in

Lines changed: 0 additions & 5 deletions
This file was deleted.

requirements-dev.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
-e .
2-
coverage==4.4.2
3-
isort==4.2.15
4-
py==1.4.34
5-
pytest-django==3.1.2
6-
pytest==3.2.3
7-
selenium==3.7.0
2+
coverage
3+
isort
4+
pytest-django
5+
pytest
6+
selenium

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
django-storages
2+
boto3

setup.cfg

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,32 @@
1+
[metadata]
2+
name = django-s3file
3+
author = Johannes Hoppe
4+
author-email = [email protected]
5+
summary = A lightweight file uploader input for Django and Amazon S3
6+
description-file = README.md
7+
home-page = https://github.com/codingjoe/django-s3file
8+
license = MIT
9+
classifier =
10+
Development Status :: 5 - Production/Stable
11+
Environment :: Web Environment
12+
Framework :: Django
13+
Intended Audience :: Developers
14+
License :: OSI Approved :: MIT License
15+
Operating System :: OS Independent
16+
Programming Language :: Python
17+
Topic :: Software Development
18+
Programming Language :: Python :: 3
19+
20+
[files]
21+
packages =
22+
s3file
23+
data_files =
24+
s3file/static/ = s3file/static/*
25+
126
[tool:pytest]
227
addopts = --tb=short -rxs
328
DJANGO_SETTINGS_MODULE=tests.testapp.settings
4-
norecursedirs = env docs
29+
norecursedirs = env docs .eggs
530

631
[pycodestyle]
732
max-line-length = 99
@@ -17,7 +42,7 @@ match-dir = (?!tests|env|\.).*
1742
atomic = true
1843
multi_line_output = 5
1944
line_length = 79
20-
skip = manage.py,.tox,env
45+
skip = manage.py,.tox,env,.eggs
2146
known_first_party = s3file,tests
2247
known_third_party = django
2348
combine_as_imports = true

setup.py

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,6 @@
22
from setuptools import setup
33

44
setup(
5-
name='django-s3file',
6-
version='3.0.3',
7-
description='A lightweight file uploader input for Django and Amazon S3',
8-
author='codingjoe',
9-
url='https://github.com/codingjoe/django-s3file',
10-
author_email='[email protected]',
11-
license='MIT',
12-
classifiers=[
13-
'Development Status :: 5 - Production/Stable',
14-
'Environment :: Web Environment',
15-
'Framework :: Django',
16-
'Intended Audience :: Developers',
17-
'License :: OSI Approved :: MIT License',
18-
'Operating System :: OS Independent',
19-
'Programming Language :: Python',
20-
'Topic :: Software Development',
21-
"Programming Language :: Python :: 3",
22-
],
23-
packages=['s3file'],
24-
include_package_data=True,
25-
install_requires=[
26-
'django-storages',
27-
'boto3',
28-
],
5+
setup_requires=['pbr'],
6+
pbr=True,
297
)

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ setenv=
66
PYTHONPATH = {toxinidir}
77
deps=
88
-rrequirements-dev.txt
9-
boto3
109
dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
1110
dj110: https://github.com/django/django/archive/stable/1.10.x.tar.gz#egg=django
1211
dj111: https://github.com/django/django/archive/stable/1.11.x.tar.gz#egg=django
1312
djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
1413
commands=
1514
coverage run --source=s3file -m 'pytest' \
1615
--basetemp={envtmpdir} \
17-
--ignore=.tox \
16+
--ignore=.tox,.eggs \
1817
{posargs}
1918

2019
[testenv:qa]

0 commit comments

Comments
 (0)