Skip to content

Commit

Permalink
Merge pull request #7120 from pymedusa/release/release-0.3.5
Browse files Browse the repository at this point in the history
Release 0.3.5
  • Loading branch information
medariox committed Sep 8, 2019
2 parents 74c3f12 + 4125564 commit baad1e5
Show file tree
Hide file tree
Showing 247 changed files with 34,005 additions and 15,966 deletions.
5 changes: 0 additions & 5 deletions .codebeatignore

This file was deleted.

6 changes: 0 additions & 6 deletions .docker/root/etc/cont-init.d/30-config

This file was deleted.

5 changes: 0 additions & 5 deletions .docker/root/etc/services.d/medusa/run

This file was deleted.

30 changes: 25 additions & 5 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
.git
.gitignore
.github
.build/
.dockerignore
.git/
.gitattributes
READMETEMPLATE.md
README.md
.github/
[Dd]ata/
[Ll]ogs/
**/__pycache__
**/.gitignore
**/*.db
**/*.db.*
**/*.log
**/*.py[cod]
**/node_modules/
cache/
Dockerfile
dredd/
hooks/
runscripts/
tests/
themes-default/
venv/

# Ignore Windows and MacOS specific files
lib/native/**/*.dll
lib/native/**/*.dylib
15 changes: 10 additions & 5 deletions .github/build-themes-check.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
#!/bin/bash
set -e

# This script expects to be run in: `Medusa/themes-default/slim`
path_to_built_themes="../../themes/"

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

get_size () {
du -sb $1 | cut -f1
}

# Determine if and how to build the Webpack bundle.
build_cmd=""
build_mode=""
Expand All @@ -22,22 +29,20 @@ elif [[ $TRAVIS_BRANCH == "develop" ]]; then
fi

# Keep track of the current themes size.
size_before=$(du -sb themes/ | cut -f1)
size_before=$(get_size $path_to_built_themes)

# Build themes.
cd themes-default/slim/
[[ -n $build_cmd ]] && run_verbose "$build_cmd"
run_verbose "yarn gulp sync"
cd ../../

# Keep track of the new themes size.
size_after=$(du -sb themes/ | cut -f1)
size_after=$(get_size $path_to_built_themes)

echo "Themes size before: $size_before"
echo "Themes size after: $size_after"

# Check if the themes changed.
status="$(git status --porcelain -- themes/)";
status="$(git status --porcelain -- $path_to_built_themes)";
if [[ -n $status && $size_before != $size_after ]]; then
if [[ -z $build_mode ]]; then
echo "Please build the themes"
Expand Down
92 changes: 44 additions & 48 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,78 +10,74 @@ before_install:
- sudo rm -f /etc/boto.cfg
install: false
script: false

# Please read about YAML Anchors & Aliases: https://blog.daemonl.com/2016/02/yaml.html
aliases:
# There's no support for concatenation so we must do this
- &node_version '10.16.0'
- &nvm_install nvm install v10.16.0
- &install_yarn_bin >-
curl -o- -L https://yarnpkg.com/install.sh | bash &&
export PATH="$HOME/.yarn/bin:$PATH"
- &backend_tests
install:
- pip install --upgrade pip
- pip install --upgrade tox
script:
- tox -v --recreate
- &dredd_tests
install:
- pip install --upgrade pip
- pip install dredd_hooks
- pip install 'PyYAML>=5.1'
- pip install six
- *nvm_install
- *install_yarn_bin
- yarn install --ignore-scripts
script:
- yarn test-api
after_failure:
- cat ./dredd/hook.log

jobs:
fast_finish: true
# fast_finish: true
include:
# test stage + frontend tests start here
- stage: test
name: 'Frontend tests'
language: node_js
node_js: 10.7.0
node_js: *node_version
install:
- 'curl -o- -L https://yarnpkg.com/install.sh | bash'
- 'export PATH="$HOME/.yarn/bin:$PATH"'
- >-
cd $TRAVIS_BUILD_DIR/themes-default/slim &&
yarn install --ignore-scripts &&
cd $TRAVIS_BUILD_DIR
script:
- ./.github/build-themes-check.sh
- *install_yarn_bin
- cd $TRAVIS_BUILD_DIR/themes-default/slim
- yarn install --ignore-scripts
script:
- $TRAVIS_BUILD_DIR/.github/build-themes-check.sh
- yarn lint
- yarn lint-css
- yarn test
- yarn coverage
# backend tests (py2.7) start here
- name: 'Backend tests (py2.7)'
python: '2.7.10'
python: '2.7'
env:
- TOXENV=py27,lint
install:
- pip install --upgrade pip
- pip install --upgrade tox
script:
- tox -v --recreate
- TOXENV=py27
<<: *backend_tests
# backend tests (py3.6) start here
- name: 'Backend tests (py3.6)'
python: '3.6'
env:
- TOXENV=py36
install:
- pip install --upgrade pip
- pip install --upgrade tox
script:
- tox -v --recreate
- TOXENV=py36,lint
<<: *backend_tests
# dredd tests (py2.7) start here
- name: 'Dredd tests (py2.7)'
python: '2.7.10'
install:
- pip install --upgrade pip
- pip install dredd_hooks
- pip install 'PyYAML>=5.1'
- pip install six
- 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
after_failure:
- cat ./dredd/hook.log
python: '2.7'
<<: *dredd_tests
# dredd tests (py3.6) start here
- name: 'Dredd tests (py3.6)'
python: '3.6'
install:
- pip install --upgrade pip
- pip install dredd_hooks
- pip install 'PyYAML>=5.1'
- pip install six
- 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
after_failure:
- cat ./dredd/hook.log
<<: *dredd_tests

notifications:
slack:
secure: >-
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
## 0.3.5 (2019-09-08)

#### New Features
- Added multi-episode naming style with lowercase `e` ([#6910](https://github.com/pymedusa/Medusa/pull/6910))

#### Improvements
- Converted the footer to a Vue component ([#4520](https://github.com/pymedusa/Medusa/pull/4520))
- Converted Edit Show to a Vue SFC ([#4486](https://github.com/pymedusa/Medusa/pull/4486)
- Improved API v2 exception reporting on Python 2 ([#6931](https://github.com/pymedusa/Medusa/pull/6931))
- Added support for qbittorrent api v2. Required from qbittorrent version > 3.2.0. ([#7040](https://github.com/pymedusa/Medusa/pull/7040))
- Removed the forced search queue item in favor of the backlog search queue item. ([#6718](https://github.com/pymedusa/Medusa/pull/6718))
- Show Header: Improved visibility of local and global configured required and ignored words. ([#7085](https://github.com/pymedusa/Medusa/pull/7085))
- Reduced frequency of file system access when not strictly required ([#7102](https://github.com/pymedusa/Medusa/pull/7102))

#### Fixes
- Fixed hdtorrent provider parse the publishing date with the day first ([#6847](https://github.com/pymedusa/Medusa/pull/6847))
- Fixed release link on Help & Info page ([#6854](https://github.com/pymedusa/Medusa/pull/6854))
- Fixed FreeMobile notifier message encode error ([#6867](https://github.com/pymedusa/Medusa/pull/6867))
- Fixed charset on API v2 responses with plain text content ([#6931](https://github.com/pymedusa/Medusa/pull/6931))
- Fixed logger causing an exception in certain cases ([#6932](https://github.com/pymedusa/Medusa/pull/6932))
- Fixed testing Plex media server when using multiple hosts ([#6976](https://github.com/pymedusa/Medusa/pull/6976))
- Fixed snatching for Xthor provider with Python 3 ([#7103](https://github.com/pymedusa/Medusa/pull/7103))

-----

## 0.3.4 (2019-06-13)

#### Fixes
Expand Down
40 changes: 26 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,35 @@
FROM lsiobase/alpine.python:3.9
MAINTAINER a10kiloham
FROM python:3.7-alpine3.9
LABEL maintainer="pymedusa"

ARG GIT_BRANCH
ARG GIT_COMMIT
ENV MEDUSA_COMMIT_BRANCH $GIT_BRANCH
ENV MEDUSA_COMMIT_HASH $GIT_COMMIT

# set version label
ARG BUILD_DATE
ARG VERSION
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL build_version="Branch: $GIT_BRANCH | Commit: $GIT_COMMIT | Build-Date: $BUILD_DATE"

# install packages
# Install packages
RUN \
apk add --no-cache \
--repository http://nl.alpinelinux.org/alpine/edge/community \
mediainfo gdbm py-gdbm
# Update
apk update \
&& \
# Runtime packages
apk add --no-cache \
mediainfo \
tzdata \
unrar \
&& \
# Cleanup
rm -rf \
/var/cache/apk/

# install app
# Install app
COPY . /app/medusa/

# copy local files
COPY .docker/root/ /

# ports and volumes
# Ports and Volumes
EXPOSE 8081
VOLUME /config /downloads /tv /anime

WORKDIR /app/medusa
CMD [ "python", "start.py", "--nolaunch", "--datadir", "/config" ]

0 comments on commit baad1e5

Please sign in to comment.