Skip to content

Commit

Permalink
Merge pull request #8886 from pymedusa/release/release-0.5.1
Browse files Browse the repository at this point in the history
Release 0.5.1
  • Loading branch information
medariox authored Dec 16, 2020
2 parents ce68da5 + a4eb30c commit d45caa6
Show file tree
Hide file tree
Showing 82 changed files with 614 additions and 856 deletions.
8 changes: 4 additions & 4 deletions .github/build-themes-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ get_size () {
# Determine if and how to build the Webpack bundle.
build_cmd=""
build_mode=""
# $TRAVIS_BRANCH is either a PR's target branch, or the current branch if it's a push build.
# ${GITHUB_BASE_REF##*/} is a PR's target branch.
# Do not build on other branches because it will cause conflicts on pull requests,
# where push builds build for development and PR builds build for production.
if [[ $TRAVIS_BRANCH == "master" ]]; then
# where push builds build for development and PR builds build for production.
if [[ ${GITHUB_BASE_REF##*/} == "master" ]]; then
build_cmd="yarn build"
build_mode="production"
elif [[ $TRAVIS_BRANCH == "develop" ]]; then
elif [[ ${GITHUB_BASE_REF##*/} == "develop" ]]; then
build_cmd="yarn dev"
build_mode="development"
fi
Expand Down
27 changes: 10 additions & 17 deletions .github/check_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,14 @@

VERSION_FILE = 'medusa/common.py'
VERSION_LINE_REGEXP = re.compile(r"VERSION = '([0-9.]+)'")
TRAVIS = os.environ.get('TRAVIS', False)

if TRAVIS:
TRAVIS_PULL_REQUEST = os.environ['TRAVIS_PULL_REQUEST'] # 'false' if not a PR, otherwise - the PR number
TRAVIS_PR_TARGET_BRANCH = os.environ['TRAVIS_BRANCH']
TRAVIS_PR_SOURCE_BRANCH = os.environ['TRAVIS_PULL_REQUEST_BRANCH']
TRAVIS_BUILD_DIR = os.environ['TRAVIS_BUILD_DIR']
else:
TRAVIS_PULL_REQUEST = '1234'
TRAVIS_PR_TARGET_BRANCH = 'master'
TRAVIS_PR_SOURCE_BRANCH = 'develop' # or 'release/release-0.2.3'
TRAVIS_BUILD_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
GH_PULL_REQUEST = os.environ['GITHUB_EVENT_NAME']
GH_PR_TARGET_BRANCH = os.environ['GITHUB_BASE_REF']
GH_PR_SOURCE_BRANCH = os.environ['GITHUB_HEAD_REF']
GH_BUILD_DIR = os.environ['GITHUB_WORKSPACE']

TRAVIS_PR_TARGET_BRANCH = TRAVIS_PR_TARGET_BRANCH.lower()
TRAVIS_PR_SOURCE_BRANCH = TRAVIS_PR_SOURCE_BRANCH.lower()
GH_PR_TARGET_BRANCH = GH_PR_TARGET_BRANCH.lower()
GH_PR_SOURCE_BRANCH = GH_PR_SOURCE_BRANCH.lower()


class Version(object):
Expand Down Expand Up @@ -61,7 +54,7 @@ def __repr__(self):
def search_file_for_version():
"""Get the app version from the code."""
version_file = VERSION_FILE.split('/')
filename = os.path.abspath(os.path.join(TRAVIS_BUILD_DIR, *version_file))
filename = os.path.abspath(os.path.join(GH_BUILD_DIR, *version_file))
with io.open(filename, 'r', encoding='utf-8') as fh:
for line in fh:
match = VERSION_LINE_REGEXP.match(line)
Expand All @@ -73,9 +66,9 @@ def search_file_for_version():

# Are we merging either develop or a release branch into master in a pull request?
if all((
TRAVIS_PULL_REQUEST != 'false',
TRAVIS_PR_TARGET_BRANCH == 'master',
TRAVIS_PR_SOURCE_BRANCH == 'develop' or TRAVIS_PR_SOURCE_BRANCH.startswith('release/')
GH_PULL_REQUEST == 'pull_request',
GH_PR_TARGET_BRANCH == 'master',
GH_PR_SOURCE_BRANCH == 'develop' or GH_PR_SOURCE_BRANCH.startswith('release/')
)):
# Get lastest git tag on master branch
proc = subprocess.call(['git', 'fetch', 'origin', 'master:master'])
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/api-tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: API tests

on: [push]
on: [pull_request]

jobs:
build:
Expand All @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: Set up Python ${{ matrix.python-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/node-frontend.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Frontend tests

on: [push]
on: [pull_request]

jobs:
build:
Expand All @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: Install themes dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-backend.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Backend tests

on: [push]
on: [pull_request]

jobs:
build:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/version-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Check app version

on: [pull_request]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Check version
run: python ./.github/check_version.py
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
## 0.5.1 (16-12-2020)

#### Improvements
- Add Processing failed for ... to custom logs
- Add and convert some network logos

#### Fixes
- Fix startup with git install without valid git
- Fix rare ADBA exception
- Fix rare anime parsing issue
- Fix exception when torrent clients don't respond
- Fix backlog search on new show add & wanted switch for old episodes
- Fix issue with broken encrypted passwords

-----

## 0.5.0 (30-11-2020)

First Python 3.x version
Expand Down
3 changes: 3 additions & 0 deletions ext/adba/aniDBAbstracter.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@ def _get_aid_from_xml(self, name):
if not self.allAnimeXML:
self.allAnimeXML = read_anidb_xml(self.cache_path)

if not self.allAnimeXML:
return 0

regex = re.compile('( \(\d{4}\))|[%s]' % re.escape(string.punctuation)) # remove any punctuation and e.g. ' (2011)'
# regex = re.compile('[%s]' % re.escape(string.punctuation)) # remove any punctuation and e.g. ' (2011)'
name = regex.sub('', name.lower())
Expand Down
2 changes: 1 addition & 1 deletion ext/certifi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from .core import contents, where

__version__ = "2020.11.08"
__version__ = "2020.12.05"
Loading

0 comments on commit d45caa6

Please sign in to comment.