Skip to content

Commit

Permalink
✨ ozi-templates becomes a dependency
Browse files Browse the repository at this point in the history
No longer depends on blastpipe.

Signed-off-by: rjdbcm <[email protected]>
  • Loading branch information
rjdbcm committed Jun 16, 2024
1 parent c54f018 commit 8d17090
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions ozi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
.. versionremoved:: 1.2
The module ``filters`` was moved to ``blastpipe.ozi_templates.filters``
.. versionchanged:: 1.12
The ozi_templates module was moved out of blastpipe.
"""
from .spec import current_version

Expand Down
4 changes: 2 additions & 2 deletions ozi/fix/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from pathlib import Path
from typing import NoReturn

from blastpipe.ozi_templates import load_environment
from blastpipe.ozi_templates.filter import underscorify # pyright: ignore
from ozi_templates import load_environment
from ozi_templates.filter import underscorify # pyright: ignore

from ozi.fix.missing import report
from ozi.fix.parser import parser
Expand Down
2 changes: 1 addition & 1 deletion ozi/fix/missing.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from pathlib import Path
from typing import TYPE_CHECKING

from blastpipe.ozi_templates.filter import underscorify # pyright: ignore
from ozi_templates.filter import underscorify # pyright: ignore

from ozi.fix.build_definition import walk
from ozi.meson import load_ast
Expand Down
2 changes: 1 addition & 1 deletion ozi/new/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from pathlib import Path
from typing import TYPE_CHECKING

from blastpipe.ozi_templates import load_environment
from ozi_templates import load_environment

from ozi.new.parser import parser
from ozi.new.validate import valid_contact_info
Expand Down
2 changes: 1 addition & 1 deletion ozi/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
from typing import Literal
from warnings import warn

from blastpipe.ozi_templates.filter import underscorify # pyright: ignore
from git import InvalidGitRepositoryError
from git import Repo
from ozi_templates.filter import underscorify # pyright: ignore

from ozi.spec import METADATA
from ozi.tap import TAP
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
GitPython>=3
blastpipe~=2024.11.10
dnspython
idna>=2
jinja2>=3
meson[ninja]>=1.1.0
ozi-templates>=2.0.2
packaging~=24.0
pip-tools
pyparsing~=3.1
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ozi_fix.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
from datetime import timedelta

import pytest
from blastpipe.ozi_templates import load_environment # pyright: ignore
from hypothesis import given
from hypothesis import settings
from hypothesis import strategies as st
from ozi_templates import load_environment # pyright: ignore

import ozi.fix.__main__ # pyright: ignore
import ozi.fix.rewrite_command # pyright: ignore
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ozi_new.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
from datetime import timedelta

import pytest
from blastpipe.ozi_templates import load_environment # pyright: ignore
from hypothesis import HealthCheck
from hypothesis import given
from hypothesis import settings
from hypothesis import strategies as st
from ozi_templates import load_environment # pyright: ignore

import ozi.actions # pyright: ignore
import ozi.new.__main__ # pyright: ignore
Expand Down

0 comments on commit 8d17090

Please sign in to comment.