Skip to content

Commit

Permalink
Merge branch 'release/1.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
olovy committed Jun 9, 2022
2 parents 752beaf + 12e8e90 commit 075ee6c
Show file tree
Hide file tree
Showing 31 changed files with 12,639 additions and 293 deletions.
20 changes: 8 additions & 12 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,15 @@ pipeline {
}
}
stage('Install Dependencies') {
environment {
FLASK_APP = 'autoapp.py'
}
steps {
//noinspection GroovyAssignabilityCheck
parallel(
'Npm install + build assets': {
sh 'npm install'
sh 'npm run build'
},
'Create virtualenv (py36)': {
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-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 'npm install'
sh 'scl enable rh-python36 ". $VENV_ROOT/py36venv/bin/activate && npm run build"'
}
post {
success {
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ Run the following commands to bootstrap your environment ::
pip install wheel
pip install -r requirements/dev.txt
npm install
npm run build
export FLASK_APP=$(pwd)/autoapp.py
export FLASK_DEBUG=1
npm run build
flask db upgrade
flask create-user --email [email protected] -p password --is-admin --is-active
npm start # run webpack dev server and flask server using concurrently
Expand Down
3 changes: 3 additions & 0 deletions assets/css/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ tr {
}

td,th {
&.min-width-150px {
min-width: 150px;
}
&.min-width-120px {
min-width: 120px;
}
Expand Down
307 changes: 200 additions & 107 deletions messages.pot

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions migrations/versions/14302cf25610_add_is_deleted_to_users.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
"""Add column 'is_deleted' to users table.
Revision ID: 14302cf25610
Revises: 750e1f83b191
Create Date: 2022-06-07 16:35:52.870887
"""

from __future__ import absolute_import, division, print_function, unicode_literals

import sqlalchemy as sa
from alembic import op

# Revision identifiers, used by Alembic.
revision = '14302cf25610'
down_revision = '750e1f83b191'
branch_labels = None
depends_on = None


def upgrade():
"""Add column 'is_deleted' to users table."""
op.add_column('users', sa.Column('is_deleted', sa.Boolean(), nullable=True))
op.execute("UPDATE users SET is_deleted = false")
### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('users', schema=None) as batch_op:
batch_op.alter_column('is_deleted', nullable=False)

### end Alembic commands ###


def downgrade():
"""Remove column 'is_deleted' to users table."""
### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('users', schema=None) as batch_op:
batch_op.drop_column('is_deleted')

### end Alembic commands ###
Loading

0 comments on commit 075ee6c

Please sign in to comment.