Skip to content

Commit

Permalink
Prepare release 1.1.0 (#185)
Browse files Browse the repository at this point in the history
* 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 (#174 and #181)
  • Loading branch information
dyve committed Dec 7, 2019
1 parent 4dd20b4 commit bb845a4
Show file tree
Hide file tree
Showing 33 changed files with 273 additions and 935 deletions.
6 changes: 0 additions & 6 deletions .coveragerc

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*.so

# Packages
.eggs
*.egg
*.egg-info
dist
Expand Down
27 changes: 15 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
dist: xenial
dist: bionic
language: python

addons:
postgresql: "9.6"
postgresql: 9.6
apt:
packages:
- postgresql-9.6-postgis-2.3
language: python
sudo: false
cache: pip
- postgresql-9.6-postgis-2.5

services:
- postgresql

python:
- "3.7"
- "3.6"
- "3.5"
install: pip install tox-travis coverage coveralls
- "3.5"
- "3.6"
- "3.7"
- "3.8"

install: pip install tox-travis
script: tox
after_success:
- coveralls
7 changes: 4 additions & 3 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,15 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 2.6, 2.7, and 3.3, and for PyPy. Check
3. The pull request should pass the Continuous Integration tests. Check
https://travis-ci.org/dyve/django-bootstrap4/pull_requests
and make sure that the tests pass for all supported Python versions.
and make sure that all tests pass. You can run the tests locally
using `tox`.

Tips
----

To run a subset of tests::

$ python -m unittest tests.test_bootstrap4
$ python manage.py test tests.test_components

14 changes: 14 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@
History
-------

1.1.0 (2019-12-06)
++++++++++++++++++
- 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 (#174 and #181)

1.0.1 (2019-08-30)
++++++++++++++++++
- Fix support for Python 3.5 (#168)
Expand Down
44 changes: 23 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
Copyright (c) Zostera B.V. and individual contributors.
BSD 3-Clause License

Copyright (c) Zostera B.V. and individual contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

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

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10 changes: 0 additions & 10 deletions MANIFEST.in

This file was deleted.

30 changes: 15 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
.PHONY: all

version_file := src/bootstrap4/_version.py
version := $(word 3, $(shell cat ${version_file}))

version:
@echo $(version)
.PHONY: clean test tox reformat lint docs build publish

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

test:
python runtests.py
coverage run manage.py test
coverage report

tox:
rm -rf .tox
tox

doclint:
pydocstyle --add-ignore=D1 src/bootstrap4 example tests *.py

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

lint:
flake8 bootstrap4 example tests *.py
pydocstyle --add-ignore=D1,D202,D301,D413 example tests *.py

docs:
cd docs && sphinx-build -b html -d _build/doctrees . _build/html

build: clean docs
python setup.py sdist bdist_wheel
twine check dist/*

publish: clean
cd docs && make html
python setup.py sdist
publish: build
twine upload dist/*
git tag -a v$(version) -m 'tagging v$(version)'
177 changes: 0 additions & 177 deletions docs/Makefile

This file was deleted.

Loading

0 comments on commit bb845a4

Please sign in to comment.