updating python version and all deps
This commit is contained in:
parent
d0b2bba7ca
commit
077b8ea4e6
30
.github/workflows/ci.yml
vendored
30
.github/workflows/ci.yml
vendored
@ -6,9 +6,9 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ['3.10']
|
python-version: ['3.11']
|
||||||
poetry-version: [1.3.1]
|
poetry-version: [1.5.1]
|
||||||
node: [19]
|
node: [20]
|
||||||
os: [ubuntu-latest]
|
os: [ubuntu-latest]
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
@ -68,26 +68,26 @@ jobs:
|
|||||||
- uses: actions/checkout@v3 # get source
|
- uses: actions/checkout@v3 # get source
|
||||||
|
|
||||||
# PYTHON
|
# PYTHON
|
||||||
- name: Install Python 3.10
|
- name: Install Python 3.11
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.10'
|
python-version: '3.11'
|
||||||
|
|
||||||
# PYTHON for dependency export only, not installing
|
# PYTHON for dependency export only, not installing
|
||||||
- name: Install Poetry 1.3.1
|
- name: Install Poetry 1.5.1
|
||||||
uses: abatilo/actions-poetry@v2.1.6
|
uses: abatilo/actions-poetry@v2.1.6
|
||||||
with:
|
with:
|
||||||
poetry-version: 1.3.1
|
poetry-version: 1.5.1
|
||||||
|
|
||||||
# PYTHON install dependencies
|
# PYTHON install dependencies
|
||||||
- name: Install Python Dependencies
|
- name: Install Python Dependencies
|
||||||
run: poetry install
|
run: poetry install
|
||||||
|
|
||||||
# # JS setup for jsdoc
|
# # JS setup for jsdoc
|
||||||
# - name: Install Node 18
|
# - name: Install Node 20
|
||||||
# uses: actions/setup-node@v2
|
# uses: actions/setup-node@v2
|
||||||
# with:
|
# with:
|
||||||
# node-version: 18
|
# node-version: 20
|
||||||
|
|
||||||
# # JS setup for jsdoc
|
# # JS setup for jsdoc
|
||||||
# - name: Install jsdoc
|
# - name: Install jsdoc
|
||||||
@ -153,26 +153,26 @@ jobs:
|
|||||||
- uses: actions/checkout@v3 # get source
|
- uses: actions/checkout@v3 # get source
|
||||||
|
|
||||||
# PYTHON (pinned to 3.9 for gcloud attribute mapping error)
|
# PYTHON (pinned to 3.9 for gcloud attribute mapping error)
|
||||||
- name: Install Python 3.9
|
- name: Install Python 3.11
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.9'
|
python-version: '3.11'
|
||||||
|
|
||||||
# PYTHON for dependency export only, not installing
|
# PYTHON for dependency export only, not installing
|
||||||
- name: Install Poetry 1.3.1
|
- name: Install Poetry 1.5.1
|
||||||
uses: abatilo/actions-poetry@v2.1.6
|
uses: abatilo/actions-poetry@v2.1.6
|
||||||
with:
|
with:
|
||||||
poetry-version: 1.3.1
|
poetry-version: 1.5.1
|
||||||
|
|
||||||
# PYTHON Export Poetry dependencies as requirements.txt
|
# PYTHON Export Poetry dependencies as requirements.txt
|
||||||
- name: Export Poetry Dependencies
|
- name: Export Poetry Dependencies
|
||||||
run: python admin.py pydepend
|
run: python admin.py pydepend
|
||||||
|
|
||||||
# JS setup
|
# JS setup
|
||||||
- name: Install Node 19
|
- name: Install Node 20
|
||||||
uses: actions/setup-node@v2
|
uses: actions/setup-node@v2
|
||||||
with:
|
with:
|
||||||
node-version: 19
|
node-version: 20
|
||||||
|
|
||||||
# JS install from lock.json
|
# JS install from lock.json
|
||||||
- name: Install Node Packages
|
- name: Install Node Packages
|
||||||
|
2
admin.py
2
admin.py
@ -83,7 +83,7 @@ class Admin(Cmd):
|
|||||||
subprocess.check_call(
|
subprocess.check_call(
|
||||||
f'gcloud functions deploy {name} '
|
f'gcloud functions deploy {name} '
|
||||||
f'--region {region} '
|
f'--region {region} '
|
||||||
'--runtime=python310 '
|
'--runtime=python311 '
|
||||||
f'--trigger-topic {name} '
|
f'--trigger-topic {name} '
|
||||||
'--set-env-vars DEPLOY_DESTINATION=PROD '
|
'--set-env-vars DEPLOY_DESTINATION=PROD '
|
||||||
f'--timeout={timeout}s', shell=True
|
f'--timeout={timeout}s', shell=True
|
||||||
|
2
app.yaml
2
app.yaml
@ -1,4 +1,4 @@
|
|||||||
runtime: python310
|
runtime: python311
|
||||||
service: spotify
|
service: spotify
|
||||||
|
|
||||||
#instance_class: F1
|
#instance_class: F1
|
||||||
|
2664
package-lock.json
generated
2664
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
28
package.json
28
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mixonomer",
|
"name": "mixonomer",
|
||||||
"version": "1.0.0",
|
"version": "1.0.2",
|
||||||
"description": "web app for spotify playlist management with last.fm integration",
|
"description": "web app for spotify playlist management with last.fm integration",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@ -21,24 +21,24 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@material-ui/core": "^4.11.3",
|
"@material-ui/core": "^4.11.3",
|
||||||
"@material-ui/icons": "^4.11.2",
|
"@material-ui/icons": "^4.11.2",
|
||||||
"axios": "^0.21.1",
|
"axios": "^1.4.0",
|
||||||
"chart.js": "^3.3.2",
|
"chart.js": "^4.3.3",
|
||||||
"react": "^17.0.2",
|
"react": "^17.0.2",
|
||||||
"react-dom": "^17.0.2",
|
"react-dom": "^17.0.2",
|
||||||
"react-router-dom": "^5.2.0"
|
"react-router-dom": "^5.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/cli": "^7.12.16",
|
"@babel/cli": "^7.22.10",
|
||||||
"@babel/core": "^7.12.16",
|
"@babel/core": "^7.22.10",
|
||||||
"@babel/preset-env": "^7.12.16",
|
"@babel/preset-env": "^7.22.10",
|
||||||
"@babel/preset-react": "^7.12.13",
|
"@babel/preset-react": "^7.22.5",
|
||||||
"babel-loader": "^8.2.2",
|
"babel-loader": "^9.1.3",
|
||||||
"clean-webpack-plugin": "^3.0.0",
|
"clean-webpack-plugin": "^4.0.0",
|
||||||
"css-loader": "^5.2.4",
|
"css-loader": "^6.8.1",
|
||||||
"jsdoc": "^4.0.2",
|
"jsdoc": "^4.0.2",
|
||||||
"style-loader": "^0.23.1",
|
"style-loader": "^3.3.3",
|
||||||
"webpack": "^5.38.1",
|
"webpack": "^5.88.2",
|
||||||
"webpack-cli": "^4.7.2",
|
"webpack-cli": "^5.1.4",
|
||||||
"webpack-merge": "^4.2.2"
|
"webpack-merge": "^5.9.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
941
poetry.lock
generated
941
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "music"
|
name = "music"
|
||||||
version = "1.0.1"
|
version = "1.0.2"
|
||||||
description = "Spotify smart playlist generator. Last.fm integration for listening statistics"
|
description = "Spotify smart playlist generator. Last.fm integration for listening statistics"
|
||||||
authors = ["andy <andy@sarsoo.xyz>"]
|
authors = ["andy <andy@sarsoo.xyz>"]
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
@ -13,18 +13,17 @@ start = 'admin:run'
|
|||||||
docs = 'admin:docs'
|
docs = 'admin:docs'
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = "~3.10"
|
python = "~3.11"
|
||||||
fireo = "^1.5.1"
|
fireo = "^2.1.0"
|
||||||
Flask = "^2.1.3"
|
Flask = "^2.1.3"
|
||||||
google-cloud-firestore = "<=2.3.4"
|
google-cloud-firestore = "<=2.10.0"
|
||||||
google-cloud-logging = "^3.2.1"
|
google-cloud-logging = "^3.2.1"
|
||||||
google-cloud-pubsub = "^2.13.4"
|
google-cloud-pubsub = "^2.13.4"
|
||||||
google-cloud-secret-manager = "^2.12.6"
|
google-cloud-secret-manager = "^2.12.6"
|
||||||
google-cloud-tasks = "^2.10.0"
|
google-cloud-tasks = "^2.10.0"
|
||||||
requests = "^2.28.1"
|
requests = "^2.28.1"
|
||||||
httpx = {extras = ["http2"], version = "^0.23.1"}
|
httpx = {extras = ["http2"], version = "^0.24.1"}
|
||||||
PyJWT = "^2.4.0"
|
PyJWT = "^2.4.0"
|
||||||
cryptography = "^38.0.4"
|
|
||||||
|
|
||||||
spotframework = { git = "https://github.com/Sarsoo/spotframework.git", branch = "master" }
|
spotframework = { git = "https://github.com/Sarsoo/spotframework.git", branch = "master" }
|
||||||
fmframework = { git = "https://github.com/Sarsoo/pyfmframework.git", branch = "master" }
|
fmframework = { git = "https://github.com/Sarsoo/pyfmframework.git", branch = "master" }
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
const merge = require('webpack-merge');
|
const { merge } = require('webpack-merge');
|
||||||
const common = require('./webpack.common.js');
|
const common = require('./webpack.common.js');
|
||||||
|
|
||||||
module.exports = merge(common, {
|
module.exports = merge(common, {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
const merge = require('webpack-merge');
|
const { merge } = require('webpack-merge');
|
||||||
const common = require('./webpack.common.js');
|
const common = require('./webpack.common.js');
|
||||||
|
|
||||||
module.exports = merge(common, {
|
module.exports = merge(common, {
|
||||||
|
Loading…
Reference in New Issue
Block a user