Skip to content

Commit

Permalink
chore: pre-release 2.6.beta-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Radi85 committed Dec 28, 2020
1 parent 8774a93 commit cbd60d8
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 111 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ script:
after_success: coveralls

jobs:
allow_failures:
- if: branch = staging
include:
- stage: deploy
python: 3.7
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ feat(*#NUMBER*): YOUR COMMIT
- ref(*#NUMBER*) for code refactoring and enhancement
- test(*#NUMBER*) for adding, fixing or adjusting tests
- doc(*#NUMBER*) for documentation
- chore(*#NUMBER*) Changes to the build process, new releases and work doesn't relate to any of the previous header

The issue number can be skipped if not available..

Expand Down
5 changes: 1 addition & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,10 @@
:target: #
:alt: Django-comment-dab Release Date

.. image:: https://img.shields.io/github/commits-since/radi85/comment/latest/master
.. image:: https://img.shields.io/github/commits-since/radi85/comment/latest/develop
:target: #
:alt: Commits since latest release for a branch master

.. image:: https://img.shields.io/github/last-commit/radi85/comment?color=blue
:target: #
:alt: Django-comment-dab last commit

===================
django-comments-dab
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.1
2.6.beta-1
2 changes: 1 addition & 1 deletion comment/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os

__version__ = '2.5.1'
__version__ = '2.6.beta-1'


def _get_version():
Expand Down
6 changes: 6 additions & 0 deletions docs/source/Changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
=========

2.6.beta1
---------

- Add subscription feature.
- Send email notifications.

2.5.1
------

Expand Down
106 changes: 1 addition & 105 deletions docs/source/contributing.rst
Original file line number Diff line number Diff line change
@@ -1,105 +1 @@
Contributing
=============

Django Comments Dab is developed and maintained by developers in an Open Source manner.
Any support is welcome. You could help by writing documentation, pull-requests, report issues and/or translations.

PR and commit messages
^^^^^^^^^^^^^^^^^^^^^^^

**Pull Requests**

Refer to `#125`_

.. _`#125`: https://github.com/Radi85/Comment/discussions/125

In order to keep master clean and up to date with the current release, all PR shall be merged with ``develop-RELEASE_MILESTONE`` branch.

``RELEASE_MILESTONE`` should be milestone tag of the issue you work on.

**Commit messages**

Use one commit per issue and try to keep the first line within 50 characters.

Need more? use the commit body.

The commit message should reference the issue number in the header (first line) like so:

feat(*#NUMBER*): YOUR COMMIT

**headers:**

- feat(*#NUMBER*) for adding new feature
- fix(*#NUMBER*) for fixing a bug
- ref(*#NUMBER*) for code refactoring and enhancement
- test(*#NUMBER*) for adding, fixing or adjusting tests
- doc(*#NUMBER*) for documentation

The issue number can be skipped if not available.

Development
^^^^^^^^^^^

To start development on this project, fork_ this repository and follow the guidelines given below.

.. _fork: https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/fork-a-repo

.. code:: bash
# clone the forked repository
$ git clone YOUR_FORKED_REPO_URL
# create a virtual environment
$ python3 -m venv local_env
# activate the virtual environment
$ source local_env/bin/activate
# install dependencies
(venv) $ pip install -e . -r example/requirements.txt
(venv) $ export DEBUG="True"
# migrate the changes to database
(venv) $ python manage.py migrate
# prepare initial data
(venv) $ python manage.py create_initial_data
# start the development server
(venv) $ python manage.py runserver
Or run with docker

.. code:: bash
$ git clone YOUR_FORKED_REPO_URL
$ cd Comment
$ docker-compose up
Login with:

username: ``test``

password: ``test``

Testing
^^^^^^^

To run tests against a particular ``python`` and ``django`` version installed inside your virtual environment, you may use:

.. code:: bash
(venv) $ python manage.py test
To run tests against all supported ``python`` and ``django`` versions, you may run:

.. code:: bash
# install dependency
(venv) $ pip install tox
# run tests
(venv) $ tox
Translations
^^^^^^^^^^^^

To add translations in your native language, please take a look at the :ref:`instructions for translators<Adding Support for Translation>`.
.. include:: ../../CONTRIBUTING.rst
1 change: 1 addition & 0 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Welcome to django-comments-dab's documentation!
settings
i18n
contributing
release-notes/index
Changelog
License
help
8 changes: 8 additions & 0 deletions docs/source/release-notes/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
===============
Release Notes
===============

.. toctree::
:maxdepth: 0

version-2.6
25 changes: 25 additions & 0 deletions docs/source/release-notes/version-2.6.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
=========================
Django-comments-dab v2.6
=========================

v2.6.beta-1
------------

Features
^^^^^^^^^

- `#43`_ - Add thread (content-type and parent comment) subscription.
- `#43`_ - Send email notification to thread's subscribers on creating new comment.

.. _#43: https://github.com/Radi85/Comment/issues/43

Codebase enhancement
^^^^^^^^^^^^^^^^^^^^^

- `#112`_ - Reduce testing time in pipeline.
- `#122`_ - Code clean up.
- `#129`_ - Update development guideline.

.. _#112: https://github.com/Radi85/Comment/issues/112
.. _#122: https://github.com/Radi85/Comment/issues/43
.. _#129: https://github.com/Radi85/Comment/issues/43

0 comments on commit cbd60d8

Please sign in to comment.