sarsoo/Mixonomer
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

updating py to 3.10, pulling docs

Browse Source
This commit is contained in:
andy 2022-07-28 07:00:27 +01:00
parent b5868fd69c
commit 18b990937f
6 changed files with 683 additions and 764 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
.github/workflows/ci.yml vendored
View File

@ -6,7 +6,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: ['3.8'] python-version: ['3.10']
poetry-version: [1.1.14] poetry-version: [1.1.14]
node: [18] node: [18]
os: [ubuntu-latest] os: [ubuntu-latest]
@ -60,59 +60,59 @@ jobs:
# - name: Run JavaScript Tests # - name: Run JavaScript Tests
# run: npm test # run: npm test
documentation: # documentation:
runs-on: ubuntu-latest # runs-on: ubuntu-latest
needs: build # for ignoring bad builds # needs: build # for ignoring bad builds
if: github.event_name == 'push' && github.ref == 'refs/heads/master' # if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps: # steps:
- uses: actions/checkout@v3 # get source # - uses: actions/checkout@v3 # get source
# PYTHON # # PYTHON
- name: Install Python 3.8 # - name: Install Python 3.10
uses: actions/setup-python@v2 # uses: actions/setup-python@v2
with: # with:
python-version: '3.8' # python-version: '3.10'
# PYTHON for dependency export only, not installing # # PYTHON for dependency export only, not installing
- name: Install Poetry 1.1.14 # - name: Install Poetry 1.1.14
uses: abatilo/actions-poetry@v2.1.0 # uses: abatilo/actions-poetry@v2.1.0
with: # with:
poetry-version: 1.1.14 # poetry-version: 1.1.14
# 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 18
uses: actions/setup-node@v2 # uses: actions/setup-node@v2
with: # with:
node-version: 18 # node-version: 18
# JS setup for jsdoc # # JS setup for jsdoc
- name: Install jsdoc # - name: Install jsdoc
run: npm install jsdoc # run: npm install jsdoc
# JS setup for jsdoc # # JS setup for jsdoc
- name: Add node_modules/.bin to PATH # - name: Add node_modules/.bin to PATH
run: echo "${GITHUB_WORKSPACE}/node_modules/.bin" >> $GITHUB_PATH # run: echo "${GITHUB_WORKSPACE}/node_modules/.bin" >> $GITHUB_PATH
# DEPLOY for setting up cloud API # # DEPLOY for setting up cloud API
- name: Set up Cloud SDK # - name: Set up Cloud SDK
uses: google-github-actions/auth@v0.7.3 # uses: google-github-actions/auth@v0.7.3
with: # with:
credentials_json: '${{ secrets.GCP_SA_KEY }}' # credentials_json: '${{ secrets.GCP_SA_KEY }}'
export_environment_variables: true # export_environment_variables: true
create_credentials_file: true # create_credentials_file: true
- name: Generate Documentation # - name: Generate Documentation
run: poetry run sphinx-build docs public -b html # run: poetry run sphinx-build docs public -b html
- name: Deploy To Pages # - name: Deploy To Pages
uses: peaceiris/actions-gh-pages@v3 # uses: peaceiris/actions-gh-pages@v3
with: # with:
github_token: ${{ secrets.GITHUB_TOKEN }} # github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public # publish_dir: ./public
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -122,10 +122,10 @@ jobs:
- uses: actions/checkout@v3 # get source - uses: actions/checkout@v3 # get source
# PYTHON # PYTHON
- name: Install Python 3.8 - name: Install Python 3.10
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
python-version: '3.8' python-version: '3.10'
# PYTHON for dependency export only, not installing # PYTHON for dependency export only, not installing
- name: Install Poetry 1.1.14 - name: Install Poetry 1.1.14

2
admin.py
View File

@ -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=python38 ' '--runtime=python310 '
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
View File

@ -1,4 +1,4 @@
runtime: python38 runtime: python310
service: spotify service: spotify
#instance_class: F1 #instance_class: F1

72
package-lock.json generated
View File

@ -2067,9 +2067,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "18.6.1", "version": "18.6.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.1.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.2.tgz",
"integrity": "sha512-z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg==", "integrity": "sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==",
"dev": true "dev": true
}, },
"node_modules/@types/prop-types": { "node_modules/@types/prop-types": {
@ -2078,9 +2078,9 @@
"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
}, },
"node_modules/@types/react": { "node_modules/@types/react": {
"version": "17.0.47", "version": "18.0.15",
"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.47.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
"integrity": "sha512-mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA==", "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
"dependencies": { "dependencies": {
"@types/prop-types": "*", "@types/prop-types": "*",
"@types/scheduler": "*", "@types/scheduler": "*",
@ -2606,9 +2606,9 @@
} }
}, },
"node_modules/browserslist": { "node_modules/browserslist": {
"version": "4.21.2", "version": "4.21.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.2.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
"integrity": "sha512-MonuOgAtUB46uP5CezYbRaYKBNt2LxP0yX+Pmj4LkcDFGkn9Cbpi83d9sCjwQDErXsIJSzY5oKGDbgOlF/LPAA==", "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -2621,10 +2621,10 @@
} }
], ],
"dependencies": { "dependencies": {
"caniuse-lite": "^1.0.30001366", "caniuse-lite": "^1.0.30001370",
"electron-to-chromium": "^1.4.188", "electron-to-chromium": "^1.4.202",
"node-releases": "^2.0.6", "node-releases": "^2.0.6",
"update-browserslist-db": "^1.0.4" "update-browserslist-db": "^1.0.5"
}, },
"bin": { "bin": {
"browserslist": "cli.js" "browserslist": "cli.js"
@ -2653,9 +2653,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001370", "version": "1.0.30001372",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001370.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001372.tgz",
"integrity": "sha512-3PDmaP56wz/qz7G508xzjx8C+MC2qEm4SYhSEzC9IBROo+dGXFWRuaXkWti0A9tuI00g+toiriVqxtWMgl350g==", "integrity": "sha512-tBgBhIXBIqORB9ieUEYBKRfSlaF6YPq7WNNqcreF6Cl24UKNGIvE5/rP59dOGN6TRIS/5zOMHAMSRrVNmifWWw==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -3015,9 +3015,9 @@
"integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==" "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.4.201", "version": "1.4.204",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.201.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.204.tgz",
"integrity": "sha512-87D0gEHbhLZgZxZl2e9/rC/I2BicPC/y9wR/cuaJSqvkgN41s5EImi89S7YExHc7F0OBXiKsABZt9mmb9bqFcQ==", "integrity": "sha512-5Ojjtw9/c9HCXtMVE6SXVSHSNjmbFOXpKprl6mY/5moLSxLeWatuYA7KTD+RzJMxLRH6yNNQrqGz9p6IoNBMgw==",
"dev": true "dev": true
}, },
"node_modules/emojis-list": { "node_modules/emojis-list": {
@ -6760,9 +6760,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "18.6.1", "version": "18.6.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.1.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.2.tgz",
"integrity": "sha512-z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg==", "integrity": "sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==",
"dev": true "dev": true
}, },
"@types/prop-types": { "@types/prop-types": {
@ -6771,9 +6771,9 @@
"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
}, },
"@types/react": { "@types/react": {
"version": "17.0.47", "version": "18.0.15",
"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.47.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
"integrity": "sha512-mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA==", "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
"requires": { "requires": {
"@types/prop-types": "*", "@types/prop-types": "*",
"@types/scheduler": "*", "@types/scheduler": "*",
@ -7230,15 +7230,15 @@
} }
}, },
"browserslist": { "browserslist": {
"version": "4.21.2", "version": "4.21.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.2.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
"integrity": "sha512-MonuOgAtUB46uP5CezYbRaYKBNt2LxP0yX+Pmj4LkcDFGkn9Cbpi83d9sCjwQDErXsIJSzY5oKGDbgOlF/LPAA==", "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"caniuse-lite": "^1.0.30001366", "caniuse-lite": "^1.0.30001370",
"electron-to-chromium": "^1.4.188", "electron-to-chromium": "^1.4.202",
"node-releases": "^2.0.6", "node-releases": "^2.0.6",
"update-browserslist-db": "^1.0.4" "update-browserslist-db": "^1.0.5"
} }
}, },
"buffer-from": { "buffer-from": {
@ -7258,9 +7258,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001370", "version": "1.0.30001372",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001370.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001372.tgz",
"integrity": "sha512-3PDmaP56wz/qz7G508xzjx8C+MC2qEm4SYhSEzC9IBROo+dGXFWRuaXkWti0A9tuI00g+toiriVqxtWMgl350g==", "integrity": "sha512-tBgBhIXBIqORB9ieUEYBKRfSlaF6YPq7WNNqcreF6Cl24UKNGIvE5/rP59dOGN6TRIS/5zOMHAMSRrVNmifWWw==",
"dev": true "dev": true
}, },
"catharsis": { "catharsis": {
@ -7525,9 +7525,9 @@
} }
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.4.201", "version": "1.4.204",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.201.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.204.tgz",
"integrity": "sha512-87D0gEHbhLZgZxZl2e9/rC/I2BicPC/y9wR/cuaJSqvkgN41s5EImi89S7YExHc7F0OBXiKsABZt9mmb9bqFcQ==", "integrity": "sha512-5Ojjtw9/c9HCXtMVE6SXVSHSNjmbFOXpKprl6mY/5moLSxLeWatuYA7KTD+RzJMxLRH6yNNQrqGz9p6IoNBMgw==",
"dev": true "dev": true
}, },
"emojis-list": { "emojis-list": {

1259
poetry.lock generated
View File

File diff suppressed because it is too large Load Diff

18
pyproject.toml
View File

@ -13,14 +13,14 @@ start = 'admin:run'
docs = 'admin:docs' docs = 'admin:docs'
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "~3.8" python = "~3.10"
fireo = "^1.3.3" fireo = "^1.5.1"
Flask = "^1.1.2" Flask = "^2.1.3"
google-cloud-firestore = "^1.7.0" google-cloud-firestore = "<=2.3.4"
google-cloud-logging = "^1.15.0" google-cloud-logging = "^3.2.1"
google-cloud-pubsub = "^1.6.0" google-cloud-pubsub = "^2.13.4"
google-cloud-tasks = "^1.5.0" google-cloud-tasks = "^2.10.0"
requests = "^2.24.0" requests = "^2.28.1"
spotframework = { git = "https://github.com/Sarsoo/spotframework.git" } spotframework = { git = "https://github.com/Sarsoo/spotframework.git" }
fmframework = { git = "https://github.com/Sarsoo/pyfmframework.git" } fmframework = { git = "https://github.com/Sarsoo/pyfmframework.git" }
@ -28,8 +28,6 @@ spotfm = { git = "https://github.com/Sarsoo/spotfm.git" }
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
pylint = "^2.5.3" pylint = "^2.5.3"
Sphinx = "^3.5.3"
sphinx-js = "^3.1.2"
python-dotenv = "^0.17.1" python-dotenv = "^0.17.1"
[build-system] [build-system]