diff options
| -rw-r--r-- | .woodpecker/eslint.yml | 6 | ||||
| -rw-r--r-- | .woodpecker/lint.yml | 6 | ||||
| -rw-r--r-- | .woodpecker/mypy.yml | 6 | ||||
| -rw-r--r-- | .woodpecker/test.yml | 11 | ||||
| -rw-r--r-- | fietsboek/alembic/versions/20251019_90b39fdf6e4b.py | 8 | ||||
| -rw-r--r-- | fietsboek/models/track.py | 12 |
6 files changed, 39 insertions, 10 deletions
diff --git a/.woodpecker/eslint.yml b/.woodpecker/eslint.yml new file mode 100644 index 0000000..1ac59d1 --- /dev/null +++ b/.woodpecker/eslint.yml @@ -0,0 +1,6 @@ +steps: + - name: eslint + image: node + commands: + - npm install + - npx eslint asset-sources/*.ts diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml new file mode 100644 index 0000000..5b6661e --- /dev/null +++ b/.woodpecker/lint.yml @@ -0,0 +1,6 @@ +steps: + - name: lint + image: python:bookworm + commands: + - pip install tox + - tox -e pylint,pylint-tests,flake,black,isort diff --git a/.woodpecker/mypy.yml b/.woodpecker/mypy.yml new file mode 100644 index 0000000..0ffc880 --- /dev/null +++ b/.woodpecker/mypy.yml @@ -0,0 +1,6 @@ +steps: + - name: mypy + image: python:bookworm + commands: + - pip install tox + - tox -e mypy diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml new file mode 100644 index 0000000..045da8e --- /dev/null +++ b/.woodpecker/test.yml @@ -0,0 +1,11 @@ +matrix: + DB: + - sqlite + - postgres + +steps: + - name: "test($DB)" + image: python:bookworm + commands: + - pip install tox + - ci/run_tests.sh $DB diff --git a/fietsboek/alembic/versions/20251019_90b39fdf6e4b.py b/fietsboek/alembic/versions/20251019_90b39fdf6e4b.py index 0192920..825f774 100644 --- a/fietsboek/alembic/versions/20251019_90b39fdf6e4b.py +++ b/fietsboek/alembic/versions/20251019_90b39fdf6e4b.py @@ -19,8 +19,8 @@ def upgrade(): op.create_table('track_points', sa.Column('track_id', sa.Integer(), nullable=False), sa.Column('index', sa.Integer(), nullable=False), - sa.Column('longitude', sa.Float(), nullable=True), - sa.Column('latitude', sa.Float(), nullable=True), + sa.Column('longitude', sa.Float(), nullable=False), + sa.Column('latitude', sa.Float(), nullable=False), sa.Column('elevation', sa.Float(), nullable=True), sa.Column('time_offset', sa.Float(), nullable=True), sa.ForeignKeyConstraint(['track_id'], ['tracks.id'], name=op.f('fk_track_points_track_id_tracks')), @@ -29,8 +29,8 @@ def upgrade(): op.create_table('waypoints', sa.Column('id', sa.Integer(), nullable=False), sa.Column('track_id', sa.Integer(), nullable=False), - sa.Column('longitude', sa.Float(), nullable=True), - sa.Column('latitude', sa.Float(), nullable=True), + sa.Column('longitude', sa.Float(), nullable=False), + sa.Column('latitude', sa.Float(), nullable=False), sa.Column('elevation', sa.Float(), nullable=True), sa.Column('name', sa.Text(), nullable=True), sa.Column('description', sa.Text(), nullable=True), diff --git a/fietsboek/models/track.py b/fietsboek/models/track.py index 9c758c6..6e132ea 100644 --- a/fietsboek/models/track.py +++ b/fietsboek/models/track.py @@ -165,8 +165,8 @@ class Waypoint(Base): __tablename__ = "waypoints" id: Mapped[int] = mapped_column(Integer, primary_key=True) track_id: Mapped[int] = mapped_column(Integer, ForeignKey("tracks.id"), nullable=False) - longitude: Mapped[float | None] = mapped_column(Float) - latitude: Mapped[float | None] = mapped_column(Float) + longitude: Mapped[float] = mapped_column(Float, nullable=False) + latitude: Mapped[float] = mapped_column(Float, nullable=False) elevation: Mapped[float | None] = mapped_column(Float) name: Mapped[str | None] = mapped_column(Text) description: Mapped[str | None] = mapped_column(Text) @@ -181,8 +181,8 @@ class TrackPoint(Base): __tablename__ = "track_points" track_id: Mapped[int] = mapped_column(Integer, ForeignKey("tracks.id"), primary_key=True) index: Mapped[int] = mapped_column(Integer, primary_key=True) - longitude: Mapped[float | None] = mapped_column(Float) - latitude: Mapped[float | None] = mapped_column(Float) + longitude: Mapped[float] = mapped_column(Float, nullable=False) + latitude: Mapped[float] = mapped_column(Float, nullable=False) elevation: Mapped[float | None] = mapped_column(Float) time_offset: Mapped[float | None] = mapped_column(Float) @@ -194,8 +194,8 @@ class TrackPoint(Base): :return: The converted point. """ return geo.Point( - latitude=self.latitude or 0.0, - longitude=self.longitude or 0.0, + latitude=self.latitude, + longitude=self.longitude, elevation=self.elevation or 0.0, time_offset=self.time_offset or 0.0, ) |