Skip to content

Commit

Permalink
Clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Nov 21, 2019
1 parent 80e6239 commit 0592fe8
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 30 deletions.
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@ section to get impression on possible commit methodology and assumptions taken.
**Generate changelog skipping orphaned commits:**

In some cases you only want to show what has been done with tickets and skip
all non-ticket related commits.
In some cases you would only want to show what has been done with tickets and
skip all non-ticket related commits.

.. code-block:: sh
generate-changelog --no-other
**Generate changelog between two releases:**

In some cases you only want to show what has been done since last release.
In other cases you would want to show what has been done since last release.
The following example would generate changelog since version 0.0.1 to
version 0.0.3.

Expand All @@ -72,8 +72,8 @@ version 0.0.3.
**Generate changelog between two branches:**

In some cases you only want to show which changes have been made to acceptance
since last production release.
Sometimes you just need to show the changes made on acceptance since last
production release.
The following example would generate changelog with changes that are on
acceptance branch and not yet in master.

Expand Down
10 changes: 5 additions & 5 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@ section to get impression on possible commit methodology and assumptions taken.
**Generate changelog skipping orphaned commits:**

In some cases you only want to show what has been done with tickets and skip
all non-ticket related commits.
In some cases you would only want to show what has been done with tickets and
skip all non-ticket related commits.

.. code-block:: sh
generate-changelog --no-other
**Generate changelog between two releases:**

In some cases you only want to show what has been done since last release.
In other cases you would want to show what has been done since last release.
The following example would generate changelog since version 0.0.1 to
version 0.0.3.

Expand All @@ -72,8 +72,8 @@ version 0.0.3.
**Generate changelog between two branches:**

In some cases you only want to show which changes have been made to acceptance
since last production release.
Sometimes you just need to show the changes made on acceptance since last
production release.
The following example would generate changelog with changes that are on
acceptance branch and not yet in master.

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-r requirements/base.txt
-r requirements/dev.txt
1 change: 1 addition & 0 deletions scripts/clean_up.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env bash
find . -name "*.pyc" -exec rm -rf {} \;
find . -name "*.py,cover" -exec rm -rf {} \;
find . -name "__pycache__" -exec rm -rf {} \;
find . -name "*.orig" -exec rm -rf {} \;
rm -rf .cache/
Expand Down
32 changes: 16 additions & 16 deletions src/matyan/labels.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
'get_ignore_commits_prefixes',
'get_other_branch_type',
'get_other_branch_type_key',
'get_unreleased',
'get_unreleased_key',
# 'get_unreleased',
# 'get_unreleased_key',
'get_unreleased_key_label',
)

Expand Down Expand Up @@ -44,20 +44,20 @@ def get_all_branch_types() -> Dict[str, str]:
return branch_types


def get_unreleased():
"""Get unreleased.
:return:
"""
return dict(CONFIG['Unreleased'])


def get_unreleased_key() -> str:
return [k for k in get_unreleased().keys()][0]


def get_unreleased_label() -> str:
return [k for k in get_unreleased().keys()][1]
# def get_unreleased():
# """Get unreleased.
#
# :return:
# """
# return dict(CONFIG['Unreleased'])
#
#
# def get_unreleased_key() -> str:
# return [k for k in get_unreleased().keys()][0]
#
#
# def get_unreleased_label() -> str:
# return [k for k in get_unreleased().keys()][1]


def get_unreleased_key_label():
Expand Down
6 changes: 3 additions & 3 deletions src/matyan/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
get_ignore_commits_prefixes,
get_other_branch_type,
get_other_branch_type_key,
get_unreleased,
get_unreleased_key,
# get_unreleased,
# get_unreleased_key,
get_unreleased_key_label,
)
from .helpers import project_dir
Expand Down Expand Up @@ -408,7 +408,7 @@ def prepare_releases_changelog(
:return:
"""
logs = get_logs(between=between, path=path)
releases = [UNRELEASED] + [tag for tag in logs['COMMIT_TAGS'].values()]
# releases = [UNRELEASED] + [tag for tag in logs['COMMIT_TAGS'].values()]
# releases_tree = {tag: generate_empty_tree() for tag in releases}
releases_tree = {}

Expand Down

0 comments on commit 0592fe8

Please sign in to comment.