Commit 1dbe6321 authored by echel0n's avatar echel0n

Merge branch 'release/10.0.9'

parents 21800455 e84d6857
......@@ -86,3 +86,4 @@ package-lock.json
/src/spritesmith-generated/
/dist/
/sickrage/core/webserver/static/js/core.js.map
/cargo/
......@@ -101,13 +101,17 @@ stages:
release_build_master:
stage: release_build
image:
name: nikolaik/python-nodejs:python3.8-nodejs10-alpine
name: nikolaik/python-nodejs:python3.9-nodejs10-alpine
variables:
NODE_ENV: "development"
CARGO_HOME: "$CI_PROJECT_DIR/cargo"
script:
- apk add --no-cache git gcc libffi-dev python3-dev musl-dev openssl-dev
- export PATH="$CARGO_HOME/bin:$PATH"
- apk add --no-cache git gcc libffi-dev python3-dev musl-dev openssl-dev curl
- curl https://sh.rustup.rs -sSf | sh -s -- -y
- git config --global user.email $(git --no-pager show -s --format='%ae' HEAD)
- git config --global user.name $(git --no-pager show -s --format='%an' HEAD)
- pip install -U pip
- pip install bumpversion
- pip install -r requirements-dev.txt
- RELEASE_VERSION=$(bumpversion --dry-run --list release | awk -F= '/new_version=/ { print $2 }')
......@@ -146,12 +150,16 @@ release_build_develop:
stage: release_build
retry: 2
image:
name: nikolaik/python-nodejs:python3.8-nodejs10-alpine
name: nikolaik/python-nodejs:python3.9-nodejs10-alpine
variables:
NODE_ENV: "development"
CARGO_HOME: "$CI_PROJECT_DIR/cargo"
script:
- apk add --no-cache git gcc libffi-dev python3-dev musl-dev openssl-dev
- export PATH="$CARGO_HOME/bin:$PATH"
- apk add --no-cache git gcc libffi-dev python3-dev musl-dev openssl-dev curl
- curl https://sh.rustup.rs -sSf | sh -s -- -y
- yarn install --pure-lockfile --cache-folder .yarn-cache
- pip install -U pip
- pip install bumpversion
- pip install -r requirements-dev.txt
- bumpversion --allow-dirty dev package.json sickrage/version.txt
......@@ -224,8 +232,13 @@ deploy_pypi:
stage: release_deploy
retry: 2
image: python:3.8-alpine3.12
variables:
CARGO_HOME: "$CI_PROJECT_DIR/cargo"
script:
- apk add --no-cache py-pip gcc libffi-dev python3-dev musl-dev openssl-dev
- export PATH="$CARGO_HOME/bin:$PATH"
- apk add --no-cache py-pip gcc libffi-dev python3-dev musl-dev openssl-dev curl
- curl https://sh.rustup.rs -sSf | sh -s -- -y
- pip install -U pip
- pip install -U twine
- python setup.py sdist bdist_wheel
- twine upload dist/*
......
......@@ -2,7 +2,16 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
#### [v10.0.8](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.7...v10.0.8)
#### [v10.0.9](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.8...v10.0.9)
- Performed webpack [`03897ba`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/03897baf59f8bbf2f73449905b5c1de93be821d7)
- Fixed "Multiple rows were found for one_or_none()" exception when getting json object of episode object [`5761806`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/5761806f6896148c6250c236faa489ba847258fc)
- Fixed issue with deploy of PyPi image [`18c3cbf`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/18c3cbf43db10e234c3d544c0854abf614dd3ef2)
- Updated CI to use python 3.9 [`58ab668`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/58ab668fb584cc95a7534c83f3faa33be1e2308a)
#### [10.0.8](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.7...10.0.8)
> 26 January 2021
- Removed ability to set web host from settings in UI, constrained to only setting from cli. [`c17dc55`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/c17dc551de4d6df4f4b20b96fb3d94bba086966e)
- Removed IRC from main layout [`87a989d`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/87a989dc9f05308ea9fd6c23aad53d0249219624)
......
{
"name": "sickrage",
"version": "10.0.8",
"version": "10.0.9",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.8
current_version = 10.0.9
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
This diff is collapsed.
......@@ -1379,9 +1379,12 @@ class TVEpisode(object):
def to_json(self):
with sickrage.app.main_db.session() as session:
episode = session.query(MainDB.TVEpisode).filter_by(series_id=self.series_id, episode_id=self.episode_id).one_or_none()
json_data = TVEpisodeSchema().dump(episode)
episode = session.query(MainDB.TVEpisode).filter_by(series_provider_id=self.series_provider_id,
series_id=self.series_id,
season=self.season,
episode=self.episode).one_or_none()
json_data = TVEpisodeSchema().dump(episode)
json_data['seriesId'] = self.series_id
json_data['episodeSlug'] = self.slug
json_data['overview'] = self.overview.name
......
......@@ -160,7 +160,7 @@ class WebServer(threading.Thread):
sickrage.app.config.general.web_root = sickrage.app.config.general.web_root = ('/' + sickrage.app.config.general.web_root.lstrip('/').strip('/'))
# api root
self.api_v1_root = fr'{sickrage.app.config.general.web_root}/api/(?:v1/)?{sickrage.app.config.general.api_v1_key}'
self.api_v1_root = fr'{sickrage.app.config.general.web_root}/api/(?:v1/)?({sickrage.app.config.general.api_v1_key})'
self.api_v2_root = fr'{sickrage.app.config.general.web_root}/api/v2'
# tornado setup
......
......@@ -638,7 +638,7 @@ class CMD_ComingEpisodes(ApiCall):
def __init__(self, application, request, *args, **kwargs):
super(CMD_ComingEpisodes, self).__init__(application, request, *args, **kwargs)
self.sort, args = self.check_params("sort", ComingEpsSortBy.DATE, False, "string", [x.name.lower() for x in ComingEpsSortBy], *args, **kwargs)
self.sort, args = self.check_params("sort", ComingEpsSortBy.DATE.name.lower(), False, "string", [x.name.lower() for x in ComingEpsSortBy], *args, **kwargs)
self.type, args = self.check_params("type", '|'.join(ComingEpisodes.categories), False, "list", ComingEpisodes.categories, *args, **kwargs)
self.paused, args = self.check_params("paused", bool(sickrage.app.config.gui.coming_eps_display_paused), False, "bool", [], *args, **kwargs)
......@@ -1174,7 +1174,7 @@ class CMD_PostProcess(ApiCall):
self.path, args = self.check_params("path", None, False, "string", [], *args, **kwargs)
self.force_replace, args = self.check_params("force_replace", False, False, "bool", [], *args, **kwargs)
self.return_data, args = self.check_params("return_data", False, False, "bool", [], *args, **kwargs)
self.process_method, args = self.check_params("process_method", ProcessMethod.COPY.name, False, "string", [x.name.lower() for x in ProcessMethod], *args, **kwargs)
self.process_method, args = self.check_params("process_method", ProcessMethod.COPY.name.lower(), False, "string", [x.name.lower() for x in ProcessMethod], *args, **kwargs)
self.is_priority, args = self.check_params("is_priority", False, False, "bool", [], *args, **kwargs)
self.delete, args = self.check_params("delete", False, False, "bool", [], *args, **kwargs)
self.failed, args = self.check_params("failed", False, False, "bool", [], *args, **kwargs)
......
10.0.8
\ No newline at end of file
10.0.9
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment