Skip to content

Commit

Permalink
Restructure code, tox, and Makefile (#466)
Browse files Browse the repository at this point in the history
* Fix compatibility with Django 3.0 and master
* Add Django 3.0 to tox.ini
* Update versions in requirements.txt
* Use Makefile for common tasks
* Drop MANIFEST.in, use setuptools_scm
* Drop _version.py, use version from git tag
  • Loading branch information
dyve committed Dec 4, 2019
1 parent 6cd5e3e commit 61a6933
Show file tree
Hide file tree
Showing 58 changed files with 481 additions and 595 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ develop-eggs
lib
lib64
.pip-wheel-metadata
.eggs

# Installer logs
pip-log.txt
Expand Down
16 changes: 11 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
dist: xenial
sudo: false
dist: bionic
language: python

addons:
postgresql: "9.6"
postgresql: "9.4"
apt:
packages:
- postgresql-9.6-postgis-2.3
- postgresql-9.4-postgis-2.4
services:
- postgresql

python:
- "3.5"
- "3.6"
- "3.7"
- "3.8"

install: pip install tox-travis
script: tox
script: tox
6 changes: 4 additions & 2 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
History
-------

12.0.0 (in development)
+++++++++++++++++++++++
12.0.0 (2019-12-04)
+++++++++++++++++++

* Drop support for Python 2.7, Django 1.11 and Django 2.0 (#456)
* Fix Deprecationwarning in Python 3.7 (#455)
Expand All @@ -14,6 +14,8 @@ History
* Add Django 3.0 to `tox.ini`
* Update versions in `requirements.txt`
* Use Makefile for common tasks
* Drop `MANIFEST.in`, use `setuptools_scm`
* Drop `_version.py`, use version from git tag

11.1.0 (2019-08-09)
+++++++++++++++++++
Expand Down
8 changes: 0 additions & 8 deletions MANIFEST.in

This file was deleted.

18 changes: 10 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
.PHONY: clean test tox reformat lint publish docs build publish
.PHONY: clean test tox reformat lint docs build publish

clean:
rm -rf build dist *.egg-info

test:
coverage run manage.py test && coverage report
coverage run manage.py test
coverage report

tox:
rm -rf .tox
tox

reformat:
isort -rc bootstrap3
isort -rc demo
isort -rc src/bootstrap3
isort -rc example
isort -rc tests
isort -rc *.py
autoflake -ir *.py bootstrap3 demo --remove-all-unused-imports
docformatter -ir --pre-summary-newline --wrap-summaries=0 --wrap-descriptions=0 *.py bootstrap3 demo
autoflake -ir *.py src/bootstrap3 example tests --remove-all-unused-imports
docformatter -ir --pre-summary-newline --wrap-summaries=0 --wrap-descriptions=0 src/bootstrap3 example tests *.py
black .

lint:
flake8
pydocstyle --add-ignore=D1,D202,D301,D413 *.py bootstrap3/ demo/
flake8 bootstrap3 src example tests *.py
pydocstyle --add-ignore=D1,D202,D301,D413 src example tests *.py

docs:
cd docs && sphinx-build -b html -d _build/doctrees . _build/html
Expand Down
3 changes: 0 additions & 3 deletions bootstrap3/__init__.py

This file was deleted.

47 changes: 0 additions & 47 deletions demo/demo/forms.py

This file was deleted.

Loading

0 comments on commit 61a6933

Please sign in to comment.