Skip to content

Commit

Permalink
Merge pull request #4763 from pymedusa/release/release-0.2.7
Browse files Browse the repository at this point in the history
Release 0.2.7
  • Loading branch information
p0psicles authored Jul 27, 2018
2 parents e7c4ff3 + 0360da9 commit b733355
Show file tree
Hide file tree
Showing 1,428 changed files with 34,140 additions and 169,758 deletions.
20 changes: 10 additions & 10 deletions .build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"install": "yarn run grunt"
},
"dependencies": {
"bower": "^1.8.4",
"grunt": "^0.4.5",
"grunt-bower-concat": "^1.0.0",
"grunt-bower-task": "^0.5.0",
"grunt-cli": "^0.1.13",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-copy": "^0.8.2",
"grunt-contrib-cssmin": "^0.14.0",
"grunt-contrib-uglify": "^0.11.1",
"load-grunt-tasks": "^3.3.0"
"bower": "1.8.4",
"grunt": "0.4.5",
"grunt-bower-concat": "1.0.0",
"grunt-bower-task": "0.5.0",
"grunt-cli": "0.1.13",
"grunt-contrib-clean": "1.1.0",
"grunt-contrib-copy": "0.8.2",
"grunt-contrib-cssmin": "0.14.0",
"grunt-contrib-uglify": "0.11.1",
"load-grunt-tasks": "3.5.2"
}
}
20 changes: 10 additions & 10 deletions .build/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ bower-json@^0.8.1:
graceful-fs "^4.1.3"
intersect "^1.0.1"

bower@^1.7.9, bower@^1.8.4:
bower@1.8.4, bower@^1.7.9:
version "1.8.4"
resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.4.tgz#e7876a076deb8137f7d06525dc5e8c66db82f28a"

Expand Down Expand Up @@ -361,7 +361,7 @@ graceful-fs@~1.2.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

grunt-bower-concat@^1.0.0:
grunt-bower-concat@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/grunt-bower-concat/-/grunt-bower-concat-1.0.0.tgz#f430c7b718704c6815215c6ca94d2fd5dd4a7b5b"
dependencies:
Expand All @@ -372,7 +372,7 @@ grunt-bower-concat@^1.0.0:
lodash "~4.3.0"
underscore.string "~3.2.3"

grunt-bower-task@^0.5.0:
grunt-bower-task@0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/grunt-bower-task/-/grunt-bower-task-0.5.0.tgz#c3c16983fabf18e412e26dfdd2114db465174584"
dependencies:
Expand All @@ -384,37 +384,37 @@ grunt-bower-task@^0.5.0:
lodash "~0.10.0"
rimraf "^2.6.1"

grunt-cli@^0.1.13:
grunt-cli@0.1.13:
version "0.1.13"
resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-0.1.13.tgz#e9ebc4047631f5012d922770c39378133cad10f4"
dependencies:
findup-sync "~0.1.0"
nopt "~1.0.10"
resolve "~0.3.1"

grunt-contrib-clean@^1.0.0:
grunt-contrib-clean@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/grunt-contrib-clean/-/grunt-contrib-clean-1.1.0.tgz#564abf2d0378a983a15b9e3f30ee75b738c40638"
dependencies:
async "^1.5.2"
rimraf "^2.5.1"

grunt-contrib-copy@^0.8.2:
grunt-contrib-copy@0.8.2:
version "0.8.2"
resolved "https://registry.yarnpkg.com/grunt-contrib-copy/-/grunt-contrib-copy-0.8.2.tgz#df31c90ffcc409bc9fafe44ec0dd1e4259916fea"
dependencies:
chalk "^1.1.1"
file-sync-cmp "^0.1.0"

grunt-contrib-cssmin@^0.14.0:
grunt-contrib-cssmin@0.14.0:
version "0.14.0"
resolved "https://registry.yarnpkg.com/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.14.0.tgz#88b0a92536969bb566281c5c61ec5062d833f3b7"
dependencies:
chalk "^1.0.0"
clean-css "~3.4.2"
maxmin "^1.1.0"

grunt-contrib-uglify@^0.11.1:
grunt-contrib-uglify@0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/grunt-contrib-uglify/-/grunt-contrib-uglify-0.11.1.tgz#5e22a2f676cd11d871fc2a0f08aa9b2973045325"
dependencies:
Expand Down Expand Up @@ -454,7 +454,7 @@ grunt-legacy-util@~0.2.0:
underscore.string "~2.2.1"
which "~1.0.5"

grunt@^0.4.5:
grunt@0.4.5:
version "0.4.5"
resolved "https://registry.yarnpkg.com/grunt/-/grunt-0.4.5.tgz#56937cd5194324adff6d207631832a9d6ba4e7f0"
dependencies:
Expand Down Expand Up @@ -590,7 +590,7 @@ lazy-cache@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"

load-grunt-tasks@^3.3.0:
load-grunt-tasks@3.5.2:
version "3.5.2"
resolved "https://registry.yarnpkg.com/load-grunt-tasks/-/load-grunt-tasks-3.5.2.tgz#0728561180fd20ff8a6927505852fc58aaea0c88"
dependencies:
Expand Down
48 changes: 31 additions & 17 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ coverage:

status:
project: # measuring the overall project coverage
default: # context, you can create multiple ones with custom titles
enabled: yes # must be yes|true to enable this status
default: # context, you can create multiple ones with custom titles, set to `off`/`no` to disable
target: auto # specify the target coverage for each commit status
# option: "auto" (must increase from parent commit or pull request base)
# option: "X%" a static target percentage to hit
branches: null # -> see https://github.com/codecov/support/wiki/Filtering-Branches
threshold: 0.1% # allowed to drop X% and still result in a "success" commit status
threshold: 5.0% # allowed to drop X% and still result in a "success" commit status
base: auto # base branch to test against?
if_no_uploads: error # will post commit status of "error" if no coverage reports we uploaded
# options: success, error, failure
Expand All @@ -31,17 +30,32 @@ coverage:
patch: # pull requests only: this commit status will measure the
# entire pull requests Coverage Diff. Checking if the lines
# adjusted are covered at least X%.
default: # context, you can create multiple ones with custom titles | default: off
enabled: yes # must be yes|true to enable this status
target: 0% # specify the target "X%" coverage to hit
branches: null # -> see https://github.com/codecov/support/wiki/Filtering-Branches
threshold: 0.1% # allowed to drop X% and still result in a "success" commit status
default: off # context, you can create multiple ones with custom titles, set to `off`/`no` to disable
# target: 0% # specify the target "X%" coverage to hit
# branches: null # -> see https://github.com/codecov/support/wiki/Filtering-Branches
# threshold: 0.1% # allowed to drop X% and still result in a "success" commit status
# if_no_uploads: error # will post commit status of "error" if no coverage reports we uploaded
# options: success, error, failure
# if_not_found: success
# if_ci_failed: error
# if_ci_failed: failure
frontend:
flags:
- frontend
target: 0%
threshold: 5.0%
if_no_uploads: error
if_not_found: success
if_ci_failed: failure
backend:
flags:
- backend
target: 0%
threshold: 5.0%
if_no_uploads: error
if_not_found: success
if_ci_failed: failure

# changes: # if there are any unexpected changes in coverage
changes: off # if there are any unexpected changes in coverage, set to `off`/`no` to disable
# default:
# enabled: yes # must be yes|true to enable this status
# branches: null # -> see https://github.com/codecov/support/wiki/Filtering-Branches
Expand All @@ -52,13 +66,13 @@ coverage:
# ignore: # files and folders that will be removed during processing
# - "glob/*"

# parsers:
# gcov:
# branch_detection:
# conditional: yes
# loop: yes
# method: no
# macro: no
parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no

comment: off # comment: off # to disable comments
# layout: "header, diff, changes, tree"
Expand Down
18 changes: 18 additions & 0 deletions .github/build-themes-check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
set -e

run_verbose () {
echo "\$ $*"
eval $*
}

cd themes-default/slim/
run_verbose "yarn gulp sync"
cd ../../
status="$(git status --porcelain -- themes/)";
if [[ -n $status ]]; then
echo "Please build the themes"
echo "-----------------------"
echo "$status"
exit 1
fi
6 changes: 5 additions & 1 deletion .github/check_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
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']
TRAVIS_COMMIT_MESSAGE = os.environ['TRAVIS_COMMIT_MESSAGE']
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__), '..'))
TRAVIS_COMMIT_MESSAGE = 'whatever' # or have [disable-version-check] to disable this check

TRAVIS_PR_TARGET_BRANCH = TRAVIS_PR_TARGET_BRANCH.lower()
TRAVIS_PR_SOURCE_BRANCH = TRAVIS_PR_SOURCE_BRANCH.lower()
Expand Down Expand Up @@ -59,8 +61,10 @@ def search_file_for_version():
return Version(match[0])


if '[disable-version-check]' in TRAVIS_COMMIT_MESSAGE:
print('Skipping version check due to commit message.')
# Are we merging either develop or a release branch into master in a pull request?
if all((
elif all((
TRAVIS_PULL_REQUEST != 'false',
TRAVIS_PR_TARGET_BRANCH == 'master',
TRAVIS_PR_SOURCE_BRANCH == 'develop' or TRAVIS_PR_SOURCE_BRANCH.startswith('release/')
Expand Down
2 changes: 1 addition & 1 deletion .github/config.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
todo:
exclude: '^(themes|lib|ext)/'
exclude: '^(\.build|themes|lib|ext)/'
64 changes: 45 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,55 @@
language: python
python:
- 2.7.10
sudo: false
before_install:
- python .github/check_version.py
install:
- pip install --upgrade pip
- pip install --upgrade tox
- pip install dredd_hooks
- pip install 'PyYAML<4'
- pip install six
- nvm install v10.1.0
- nvm use v10.1.0
- 'curl -o- -L https://yarnpkg.com/install.sh | bash'
- 'export PATH="$HOME/.yarn/bin:$PATH" && yarn install --ignore-scripts'
script:
- yarn test
- tox -v --recreate
cache:
yarn: true
directories:
- $HOME/.cache/pip
- node_modules
after_failure:
- cat ./dredd/data/Logs/application.log
before_install:
- python .github/check_version.py
install: false
script: false
jobs:
include:
# test stage + frontend tests start here
- stage: test
name: 'Frontend tests'
language: node_js
node_js: 10.7.0
install:
- 'curl -o- -L https://yarnpkg.com/install.sh | bash'
- 'export PATH="$HOME/.yarn/bin:$PATH"'
- yarn install --ignore-scripts
- >-
cd $TRAVIS_BUILD_DIR/themes-default/slim &&
yarn install --ignore-scripts &&
cd $TRAVIS_BUILD_DIR
script:
- ./.github/build-themes-check.sh
- yarn test-css
- cd $TRAVIS_BUILD_DIR/themes-default/slim
- yarn xo
- yarn test
- yarn coverage
# backend tests start here
- name: 'Backend tests'
python:
- 2.7.10
install:
- pip install --upgrade pip
- pip install --upgrade tox
# install everything needed for `yarn test-api`
- pip install dredd_hooks
- pip install 'PyYAML<4'
- pip install six
- nvm install v10.1.0
- 'curl -o- -L https://yarnpkg.com/install.sh | bash'
- 'export PATH="$HOME/.yarn/bin:$PATH" && yarn install --ignore-scripts'
script:
- yarn test-api
- tox -v --recreate
after_failure:
- cat ./dredd/data/Logs/application.log
notifications:
slack:
secure: >-
Expand Down
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
## Unreleased

-----

## 0.2.7 (2018-07-27)

#### New Features
- Hot-swap themes: No need to restart Medusa after changing the theme ([#4271](https://github.com/pymedusa/Medusa/pull/4271))

#### Improvements
- Moved the following routes to use `VueRouter` + `http-vue-loader`:
- `/config` - Help & Info ([#4374](https://github.com/pymedusa/Medusa/pull/4374))
- `/addShows` - Add Shows ([#4564](https://github.com/pymedusa/Medusa/pull/4564))
- `/addRecommended` - Add Recommended Shows ([#4564](https://github.com/pymedusa/Medusa/pull/4564))
- `/login` - Login ([#4634](https://github.com/pymedusa/Medusa/pull/4634))
- Removed the old `/ui` route ([#4565](https://github.com/pymedusa/Medusa/pull/4565))
- Added a simple "Loading..." message while the page is loading ([#4629](https://github.com/pymedusa/Medusa/pull/4629))
- Expanded episode status management capabilities, added support for Downloaded, Archived ([#4647](https://github.com/pymedusa/Medusa/pull/4647))
- Added ability to manually change episode quality ([#4658](https://github.com/pymedusa/Medusa/pull/4658))
- Converted to Vue components:
- header ([#4519](https://github.com/pymedusa/Medusa/pull/4519))
- sub-menu ([#4739](https://github.com/pymedusa/Medusa/pull/4739))
- Add Viaplay network logo ([#4691](https://github.com/pymedusa/Medusa/pull/4691))
- Convert Vue components to SFC - Single-File Components ([#4696](https://github.com/pymedusa/Medusa/pull/4696))

#### Fixes
- Fixed malformed non-ASCII characters displaying for Windows users on "View Logs" page ([#4492](https://github.com/pymedusa/Medusa/pull/4492))
- Fixed Emby test notification ([#4622](https://github.com/pymedusa/Medusa/pull/4622))
- Fixed NorBits provider formatting download URL incorrectly ([#4642](https://github.com/pymedusa/Medusa/pull/4642))
- Fixed reference linking ([#4463](https://github.com/pymedusa/Medusa/pull/4463))
- Fixed the Show Selector not honoring user option to split shows & anime ([#4625](https://github.com/pymedusa/Medusa/pull/4625))
- Fixed unhandled request error on Add Existing Show ([#4639](https://github.com/pymedusa/Medusa/pull/4639))
- Fixed Telegram & Growl message encoding ([#4657](https://github.com/pymedusa/Medusa/pull/4657))
- Fixed being unable to change scene numbering for first 2 episodes of each season on displayShow ([#4656](https://github.com/pymedusa/Medusa/pull/4656))
- Fixed YggTorrents provider downloads by updating the provider's URL ([#4725](https://github.com/pymedusa/Medusa/pull/4725))
- Fixed Abnormal provider login check ([#4727](https://github.com/pymedusa/Medusa/pull/4727))
- Fixed IMDB cache location ([#4745](https://github.com/pymedusa/Medusa/pull/4745))
- Fixed "Edit Show" page sometimes failing to load the show ([#4756](https://github.com/pymedusa/Medusa/pull/4756))

-----

### [**Previous versions**](https://github.com/pymedusa/medusa.github.io/blob/master/news/CHANGES.md#v026)
Loading

0 comments on commit b733355

Please sign in to comment.