Skip to content

Commit bb845a4

Browse files
authored
Prepare release 1.1.0 (zostera#185)
* Prepare release 1.1.0 - Update default Bootstrap to v4.3.1 - Add support for Python 3.8, Django 3 and Django master - Switch to Django `manage.py` for test running - Update Makefile commands - Update tox configuration - Use correct license (BSD-3-Clause) - Fix typo's in docstrings - Update Travis configuration - Drop MANIFEST.in, use setuptools_scm - Stop using _version.py, use git tags for versioning - Fixed issues with labels and input (zostera#174 and zostera#181)
1 parent 4dd20b4 commit bb845a4

33 files changed

+273
-935
lines changed

.coveragerc

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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*.so
55

66
# Packages
7+
.eggs
78
*.egg
89
*.egg-info
910
dist

.travis.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
dist: xenial
1+
dist: bionic
2+
language: python
3+
24
addons:
3-
postgresql: "9.6"
5+
postgresql: 9.6
46
apt:
57
packages:
6-
- postgresql-9.6-postgis-2.3
7-
language: python
8-
sudo: false
9-
cache: pip
8+
- postgresql-9.6-postgis-2.5
9+
10+
services:
11+
- postgresql
12+
1013
python:
11-
- "3.7"
12-
- "3.6"
13-
- "3.5"
14-
install: pip install tox-travis coverage coveralls
14+
- "3.5"
15+
- "3.6"
16+
- "3.7"
17+
- "3.8"
18+
19+
install: pip install tox-travis
1520
script: tox
16-
after_success:
17-
- coveralls

CONTRIBUTING.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,15 @@ Before you submit a pull request, check that it meets these guidelines:
101101
2. If the pull request adds functionality, the docs should be updated. Put
102102
your new functionality into a function with a docstring, and add the
103103
feature to the list in README.rst.
104-
3. The pull request should work for Python 2.6, 2.7, and 3.3, and for PyPy. Check
104+
3. The pull request should pass the Continuous Integration tests. Check
105105
https://travis-ci.org/dyve/django-bootstrap4/pull_requests
106-
and make sure that the tests pass for all supported Python versions.
106+
and make sure that all tests pass. You can run the tests locally
107+
using `tox`.
107108

108109
Tips
109110
----
110111

111112
To run a subset of tests::
112113

113-
$ python -m unittest tests.test_bootstrap4
114+
$ python manage.py test tests.test_components
114115

HISTORY.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
33
History
44
-------
55

6+
1.1.0 (2019-12-06)
7+
++++++++++++++++++
8+
- Update default Bootstrap to v4.3.1
9+
- Add support for Python 3.8, Django 3 and Django master
10+
- Switch to Django `manage.py` for test running
11+
- Update Makefile commands
12+
- Update tox configuration
13+
- Use correct license (BSD-3-Clause)
14+
- Fix typo's in docstrings
15+
- Update Travis configuration
16+
- Drop MANIFEST.in, use setuptools_scm
17+
- Stop using _version.py, use git tags for versioning
18+
- Fixed issues with labels and input (#174 and #181)
19+
620
1.0.1 (2019-08-30)
721
++++++++++++++++++
822
- Fix support for Python 3.5 (#168)

LICENSE

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
1-
Copyright (c) Zostera B.V. and individual contributors.
1+
BSD 3-Clause License
2+
3+
Copyright (c) Zostera B.V. and individual contributors
24
All rights reserved.
35

4-
Redistribution and use in source and binary forms, with or without modification,
5-
are permitted provided that the following conditions are met:
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are met:
68

7-
1. Redistributions of source code must retain the above copyright notice,
8-
this list of conditions and the following disclaimer.
9+
* Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
911

10-
2. Redistributions in binary form must reproduce the above copyright
11-
notice, this list of conditions and the following disclaimer in the
12-
documentation and/or other materials provided with the distribution.
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
1315

14-
3. Neither the name of Zostera B.V. nor the names of its contributors may be
15-
used to endorse or promote products derived from this software without
16-
specific prior written permission.
16+
* Neither the name of the copyright holder nor the names of its
17+
contributors may be used to endorse or promote products derived from
18+
this software without specific prior written permission.
1719

18-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
22-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
25-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

MANIFEST.in

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

Makefile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
.PHONY: all
2-
3-
version_file := src/bootstrap4/_version.py
4-
version := $(word 3, $(shell cat ${version_file}))
5-
6-
version:
7-
@echo $(version)
1+
.PHONY: clean test tox reformat lint docs build publish
82

93
clean:
104
rm -rf build dist *.egg-info
115

126
test:
13-
python runtests.py
7+
coverage run manage.py test
8+
coverage report
149

1510
tox:
1611
rm -rf .tox
1712
tox
1813

19-
doclint:
20-
pydocstyle --add-ignore=D1 src/bootstrap4 example tests *.py
21-
2214
reformat:
23-
docformatter -ir --pre-summary-newline --wrap-summaries=0 --wrap-descriptions=0 src/bootstrap4 example tests *.py
2415
isort -rc src/bootstrap4
2516
isort -rc example
2617
isort -rc tests
2718
isort -rc *.py
2819
autoflake -ir *.py src/bootstrap4 example tests --remove-all-unused-imports
20+
docformatter -ir --pre-summary-newline --wrap-summaries=0 --wrap-descriptions=0 src/bootstrap4 example tests *.py
2921
black .
22+
23+
lint:
3024
flake8 bootstrap4 example tests *.py
25+
pydocstyle --add-ignore=D1,D202,D301,D413 example tests *.py
26+
27+
docs:
28+
cd docs && sphinx-build -b html -d _build/doctrees . _build/html
29+
30+
build: clean docs
31+
python setup.py sdist bdist_wheel
32+
twine check dist/*
3133

32-
publish: clean
33-
cd docs && make html
34-
python setup.py sdist
34+
publish: build
3535
twine upload dist/*
3636
git tag -a v$(version) -m 'tagging v$(version)'

docs/Makefile

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

0 commit comments

Comments
 (0)