Skip to content

Commit

Permalink
Merge branch 'main' into aholmes-add-caching-feature-flag-router
Browse files Browse the repository at this point in the history
  • Loading branch information
aholmes authored Aug 8, 2024
2 parents aff6112 + 44df21a commit 6dd22dc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ $(MAKE_ARTIFACT_DIRECTORY):
SETUP_DEPENDENCIES_SENTINEL = $(MAKE_ARTIFACT_DIRECTORY)/dependencies_sentinel
SETUP_DEV_SENTINEL = $(MAKE_ARTIFACT_DIRECTORY)/setup_dev_sentinel
SETUP_CICD_SENTINEL = $(MAKE_ARTIFACT_DIRECTORY)/setup_cicd_sentinel
PYPROJECT_FILES_SENTINEL = $(MAKE_ARTIFACT_DIRECTORY)/pyproject_sentinel

PYPROJECT_FILES_SENTINEL = ./.pyproject_sentinel
$(PYPROJECT_FILES_SENTINEL): $(VENV)
$(MAKE) $(PYPROJECT_FILES)
touch $@
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ dev-dependencies = [
"junit2html >= 30.1,< 32.0",
# Pyright >= 1.1.367 breaks the build.
# Waiting for new pyright release to fix it. https://github.com/uclahs-cds/BL_Python/issues/79
"pyright == 1.1.374",
"pyright == 1.1.375",
"isort ~= 5.13",
"ruff ~= 0.3",
"bandit[sarif,toml] ~= 1.7"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def _copy_files(self, files: list[FileCopy], force_overwrite: bool = False):
open(file.source, "r") as source,
open(file.destination, write_mode) as destination,
):
destination.writelines(cast(BinaryIO, source.buffer)) # pyright: ignore[reportUnnecessaryCast] Disagreement between pyright and pylance. Pyright things this is a different type, and pylance doesn't like the cast.
destination.writelines(cast(BinaryIO, source.buffer))
except FileExistsError as e:
if e.filename != str(file.destination):
raise
Expand Down

0 comments on commit 6dd22dc

Please sign in to comment.