Skip to content

Commit

Permalink
Merge branch 'master' into update-slurm-upload-jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
seallard committed Jan 29, 2024
2 parents f598758 + c660742 commit 382b717
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 20.2.1
current_version = 20.2.4
commit = True
tag = True
tag_name = {new_version}
Expand Down
22 changes: 0 additions & 22 deletions .configs/pylintrc

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1
- uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: "3.11"
- uses: psf/black@stable
with:
options: ". --check --line-length 100"
2 changes: 1 addition & 1 deletion .github/workflows/production_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1

- name: Set up Python
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_to_pypi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out git repository
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1

- name: Set up Python
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_and_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1

- name: Set up Python
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: 23.11.0
rev: 24.1.0
hooks:
- id: black
args: [ --line-length=100 ]
Expand Down
25 changes: 25 additions & 0 deletions alembic/versions/2024_01_26_dc1aadf08b4d_drop_avatar.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
"""drop_avatar
Revision ID: dc1aadf08b4d
Revises: 486e8c875e0b
Create Date: 2024-01-26 14:46:22.119614
"""

# revision identifiers, used by Alembic.
revision = "dc1aadf08b4d"
down_revision = "486e8c875e0b"
branch_labels = None
depends_on = None

import sqlalchemy as sa

from alembic import op


def upgrade():
op.drop_column("user", "avatar")


def downgrade():
op.add_column("user", sa.Column("avatar", sa.Text(), nullable=True))
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def parse_reqs(req_path="./requirements.txt"):

setup(
name=NAME,
version="20.2.1",
version="20.2.4",
description=DESCRIPTION,
long_description=LONG_DESCRIPTION,
long_description_content_type="text/markdown",
Expand Down
1 change: 0 additions & 1 deletion trailblazer/dto/analysis_response.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@


class User(BaseModel):
avatar: str | None = None
created_at: datetime | None = None
email: str | None = None
id: int
Expand Down
2 changes: 0 additions & 2 deletions trailblazer/store/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def to_dict(self) -> dict:
class User(Model):
__tablename__ = "user"

avatar = Column(types.Text)
created_at = Column(types.DateTime, default=datetime.datetime.now)
email = Column(types.String(128), unique=True)
google_id = Column(types.String(128), unique=True)
Expand All @@ -57,7 +56,6 @@ def to_dict(self) -> dict:
"id": self.id,
"name": self.name,
"email": self.email,
"avatar": self.avatar,
"created_at": self.created_at,
"is_archived": self.is_archived,
}
Expand Down

0 comments on commit 382b717

Please sign in to comment.