Merge branch 'release/1.10.0'

libris · Aug 28, 2023 · 4aed894 · 4aed894
2 parents 1d97d82 + dc10bd3
commit 4aed894
Show file tree

Hide file tree

Showing 168 changed files with 5,609 additions and 22,680 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -4,7 +4,10 @@
         "browser": true,
         "node": true
     },
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
+    "parserOptions": {
+        requireConfigFile: false
+    },
     "rules": {
         "max-len": ["error", {"code": 100, "ignoreStrings": true}],
         "comma-dangle": ["error", "never"]

diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM node:8-alpine AS build
+FROM node:14-alpine AS build
 WORKDIR /xl_auth
 COPY . .
-RUN rm -rf *venv/ && rm -f assets/.DS_Store && npm install && npm run build && rm -rf node_modules/
+RUN rm -rf *venv/ && rm -f assets/.DS_Store && npm install && npm run build-no-flask && rm -rf node_modules/
 
 FROM python:3.6-slim
 ENV FLASK_DEBUG=1

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -98,15 +98,15 @@ pipeline {
                 FLASK_APP = 'autoapp.py'
             }
             steps {
-                sh 'scl enable rh-python36 "virtualenv $VENV_ROOT/py36venv"'
-                sh 'scl enable rh-python36 ". $VENV_ROOT/py36venv/bin/activate && python -m pip install -U pip"'
-                sh 'scl enable rh-python36 "$VENV_ROOT/py36venv/bin/pip --cache-dir ~/.cache/pip36/$EXECUTOR_NUMBER install -r requirements/dev.txt"'
+                sh 'scl enable rh-python38 "python3 -m venv $VENV_ROOT/py38venv"'
+                sh 'scl enable rh-python38 ". $VENV_ROOT/py38venv/bin/activate && python -m pip install -U pip"'
+                sh 'scl enable rh-python38 "$VENV_ROOT/py38venv/bin/pip --cache-dir ~/.cache/pip38/$EXECUTOR_NUMBER install -r requirements/dev.txt"'
                 sh 'npm install'
-                sh 'scl enable rh-python36 ". $VENV_ROOT/py36venv/bin/activate && npm run build"'
+                sh 'scl enable rh-python38 ". $VENV_ROOT/py38venv/bin/activate && npm run build"'
             }
             post {
                 success {
-                    sh 'scl enable rh-python36 ". $VENV_ROOT/py36venv/bin/activate && \
+                    sh 'scl enable rh-python38 ". $VENV_ROOT/py38venv/bin/activate && \
 FLASK_APP=autoapp.py flask translate"'
                 }
             }
@@ -133,14 +133,14 @@ FLASK_APP=autoapp.py flask translate"'
 //                             }
 //                         }
 //                     },
-                    'pytest (py36)': {
+                    'pytest (py38)': {
                         script {
                             try {
-                                sh 'scl enable rh-python36 ". $VENV_ROOT/py36venv/bin/activate && \
-flask test --junit-xml=py36test-junit.xml"'
+                                sh 'scl enable rh-python38 ". $VENV_ROOT/py38venv/bin/activate && \
+flask test --junit-xml=py38test-junit.xml"'
                             }
                             finally {
-                                junit 'py36test-junit.xml'
+                                junit 'py38test-junit.xml'
                             }
                         }
                     }