Skip to content

Commit

Permalink
Merge pull request #5122 from pymedusa/release/release-0.2.9
Browse files Browse the repository at this point in the history
Release 0.2.9
  • Loading branch information
medariox authored Sep 6, 2018
2 parents f5973b2 + 44396c6 commit db3d9d7
Show file tree
Hide file tree
Showing 689 changed files with 84,001 additions and 225,833 deletions.
37 changes: 3 additions & 34 deletions .build/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
clean: {
dist: './dist/',
bower_components: './bower_components', // eslint-disable-line camelcase
fonts: '../themes-default/slim/static/css/*.ttf',
options: {
force: true
}
Expand All @@ -24,6 +23,9 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
css: './dist/bower.css'
},
exclude: [
// Moved to Webpack
'jquery',
'bootstrap'
],
dependencies: {
},
Expand All @@ -33,19 +35,12 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
'dist/js/widgets/widget-columnSelector.min.js',
'dist/css/theme.blue.min.css'
],
bootstrap: [
'dist/css/bootstrap.min.css',
'dist/js/bootstrap.min.js'
],
isotope: [
'dist/isotope.pkgd.min.js'
],
outlayer: [
'item.js',
'outlayer.js'
],
openSans: [
'openSans.css'
]
},
bowerOptions: {
Expand All @@ -54,32 +49,6 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
}
},
copy: {
openSans: {
files: [{
expand: true,
dot: true,
cwd: 'bower_components/openSans',
src: [
'*.ttf'
],
dest: '../themes-default/slim/static/css/'
}]
},
glyphicon: {
files: [{
expand: true,
dot: true,
cwd: 'bower_components/bootstrap/fonts',
src: [
'*.eot',
'*.svg',
'*.ttf',
'*.woff',
'*.woff2'
],
dest: '../themes-default/slim/static/fonts/'
}]
},
vender: {
files: [{
expand: true,
Expand Down
11 changes: 1 addition & 10 deletions .build/bower.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,25 @@
{
"name": "Medusa",
"name": "medusa",
"private": true,
"dependencies": {
"jquery": "3.0.0",
"jquery-ui": "1.12.1",
"bootstrap": "3.3.7",
"jqueryui-touch-punch": "*",
"jquery-form": "4.0.1",
"jquery-tokeninput": "^1.7.0",
"jquery-confirm": "2.5.2",
"jquery-backstretch": "^2.1.15",
"bootstrap3-typeahead": "4.0.2",
"lodash": "4.17.4",
"underscore.string": "^3.3.4",
"loglevel": "1.4.1",
"timeago": "1.5.4",
"pnotify": "2.1.0",
"qtip2": "2.2.1",
"tablesorter": "jquery.tablesorter#2.28.1",
"isotope": "3.0.1",
"openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic",

"fizzy-ui-utils": "2.0.5",
"get-size": "2.0.2",
"masonry": "4.2.0",
"ev-emitter": "1.1.0",
"imagesloaded": "4.1.3"
},
"resolutions": {
"bootstrap": "3.3.7",
"jquery": "3.0.0"
}
}
27 changes: 16 additions & 11 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
# The above will handle all files NOT found below
#

# Linguist overrides for vendored files
lib/** linguist-vendored
ext/** linguist-vendored
lib[23]/** linguist-vendored
ext[23]/** linguist-vendored
# Linguist overrides for generated code
themes/** linguist-generated

#
## These files are text and should be normalized (Convert crlf => lf)
#
Expand All @@ -19,7 +27,6 @@

# Documentation
*.md text
CHANGES text

# Startup script
init.* text
Expand All @@ -42,26 +49,24 @@ init.* text
*.mako text

# Web file
*.htm text
*.html text
*.css text
*.js text
*.xml text
*.htm text
*.html text
*.css text
*.js text
*.xml text

#
## These files are binary and should be left untouched
## (binary is a macro for -text -diff)
#

# Python Binary files
*.db binary
*.p binary
*.pkl binary
*.pyc binary
*.pyd binary
*.pyo binary
*.py[cod] binary

# These files are binary and should be left untouched
# (binary is a macro for -text -diff)
*.png binary
*.jpg binary
*.jpeg binary
Expand All @@ -77,4 +82,4 @@ init.* text
*.eot binary
*.rar binary
*.dll binary
*.lib
*.lib binary
33 changes: 28 additions & 5 deletions .github/build-themes-check.sh
Original file line number Diff line number Diff line change
@@ -1,18 +1,41 @@
#!/bin/bash
set -e

# Helper function to print the command before running it.
run_verbose () {
echo "\$ $*"
eval $*
echo "\$ $*"
eval $*
}

# 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.
# 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
build_cmd="yarn build"
build_mode="production"
elif [[ $TRAVIS_BRANCH == "develop" ]]; then
build_cmd="yarn dev"
build_mode="development"
fi

# Build themes.
cd themes-default/slim/
[[ -n $build_cmd ]] && run_verbose "$build_cmd"
run_verbose "yarn gulp sync"
cd ../../
# Check if the themes changed.
status="$(git status --porcelain -- themes/)";
if [[ -n $status ]]; then
echo "Please build the themes"
echo "-----------------------"
if [[ -z $build_mode ]]; then
echo "Please build the themes"
echo "-----------------------"
else
echo "Please build the themes (mode: $build_mode) "
echo "--------------------------------------------"
fi
echo "$status"
exit 1
fi
fi
8 changes: 2 additions & 6 deletions .github/check_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
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 @@ -61,14 +59,12 @@ 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?
elif all((
if all((
TRAVIS_PULL_REQUEST != 'false',
TRAVIS_PR_TARGET_BRANCH == 'master',
TRAVIS_PR_SOURCE_BRANCH == 'develop' or TRAVIS_PR_SOURCE_BRANCH.startswith('release/')
)):
)):
# Get lastest git tag on master branch
proc = subprocess.call(['git', 'fetch', 'origin', 'master:master'])
if proc > 0:
Expand Down
28 changes: 0 additions & 28 deletions .pyup.yml

This file was deleted.

15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@ jobs:
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 lint-css
- yarn test
- yarn coverage
# backend tests start here
Expand All @@ -38,16 +37,22 @@ jobs:
install:
- pip install --upgrade pip
- pip install --upgrade tox
# install everything needed for `yarn test-api`
script:
- tox -v --recreate
# dredd tests start here
- name: 'Dredd tests'
python:
- 2.7.10
install:
- pip install --upgrade pip
- pip install dredd_hooks
- pip install 'PyYAML<4'
- pip install six
- nvm install v10.1.0
- nvm install v10.7.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:
Expand Down
2 changes: 2 additions & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--add.exact true
--upgrade.exact true
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,32 @@

-----

## 0.2.9 (2018-09-06)

#### Improvements
- Converted Post-Processing Config to a Vue SFC ([#4259](https://github.com/pymedusa/Medusa/pull/4259) + [#4946](https://github.com/pymedusa/Medusa/pull/4946))
- Bundled the web application using Webpack ([#4692](https://github.com/pymedusa/Medusa/pull/4692))
- Updated adba (anidb) client to version 1.0.0 (python 2/3 compatible) ([#4822](https://github.com/pymedusa/Medusa/pull/4822))
- Changed caching location for the adba and simpleanidb libs to the default Medusa cache location ([#4822](https://github.com/pymedusa/Medusa/pull/4822))
- Added a new field name 'watched' to the tv_episodes db table. UI will be added in future ([#4825](https://github.com/pymedusa/Medusa/pull/4825))
- Standardized most titles and headers ([#4663](https://github.com/pymedusa/Medusa/pull/4663))
- Converted IRC page into a Vue SFC ([#5089](https://github.com/pymedusa/Medusa/pull/5089))

#### Fixes
- Fixed error when changing episode status from episode status management ([#4783](https://github.com/pymedusa/Medusa/pull/4783))
- Fixed multi-episode snatches not being marked as snatched in history ([#229](https://github.com/pymedusa/Medusa/issues/229))
- Fixed whole seasons being downloaded as multi-episode replacement ([#4750](https://github.com/pymedusa/Medusa/issues/4750))
- Fixed yggtorrent changed url to new url ([#4843](https://github.com/pymedusa/Medusa/issues/4843))
- Fixed excessive anidb udp calls when opening editShow ([#4822](https://github.com/pymedusa/Medusa/pull/4822))
- Fixed UI not loading using edge browser, when using a reverse proxy (without an alternative port) ([#4928](https://github.com/pymedusa/Medusa/pull/4928))
- Fixed episode lookup with conflicting show IDs ([#4933](https://github.com/pymedusa/Medusa/pull/4933))
- Fixed error getting season scene exceptions on show page [#4964](https://github.com/pymedusa/Medusa/pull/4964)
- Fixed testing email notification with TLS ([#4972](https://github.com/pymedusa/Medusa/pull/4972))
- Fixed provider hd-space parsing pubdate like 'yesterday at 12:00:00' ([#5111](https://github.com/pymedusa/Medusa/pull/5111))
- Fixed apiv2 call hanging, when opening an anime show, that has malformed data on anidb (with anidb enabled) ([#4961](https://github.com/pymedusa/Medusa/pull/4961))

-----

## 0.2.8 (2018-07-28)

#### Fixes
Expand Down
Loading

0 comments on commit db3d9d7

Please sign in to comment.