Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vatger/atciss
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a68f2640cfc0f7425cf29f38351102c18de7c122
Choose a base ref
..
head repository: vatger/atciss
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 754461b665c595f9e7501304653384c539216847
Choose a head ref
Showing with 41 additions and 21 deletions.
  1. +6 −0 .github/dependabot.yml
  2. +4 −1 .github/workflows/build.yml
  3. +11 −0 flake.nix
  4. +19 −19 poetry.lock
  5. +1 −1 pyproject.toml
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -18,3 +18,9 @@ updates:
interval: "daily"
labels:
- automated
- package-ecosystem: "npm"
directory: "/atciss-frontend"
schedule:
interval: "daily"
labels:
- automated
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -30,5 +30,8 @@ jobs:
if [ "$GITHUB_REF_NAME" == "main" ]; then
tag=latest
fi
skopeo copy --insecure-policy docker-archive://$(readlink -f ./result) docker://ghcr.io/$CI_PROJECT_PATH/atciss-$target:$tag
if [ "$GITHUB_EVENT_NAME" != "pull_request" ]; then
skopeo copy --insecure-policy docker-archive://$(readlink -f ./result) docker://ghcr.io/$CI_PROJECT_PATH/atciss-$target:$tag
fi
done
11 changes: 11 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -97,6 +97,17 @@
--replace 'poetry.masonry.api' 'poetry.core.masonry.api'
'';
});
ruff = pyprev.ruff.overridePythonAttrs (old: rec {
src = final.fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
rev = "v${old.version}";
sha256 = "";
};
cargoDeps = final.rustPlatform.importCargoLock {
lockFile = "${src.out}/Cargo.lock";
};
});
});
in {
atciss =
38 changes: 19 additions & 19 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ types-beautifulsoup4 = "^4.12.0.5"
types-python-jose = "^3.3.4.8"
mypy = "^1.7.0"
pyright = "1.1.338"
ruff = "0.1.5"
ruff = "0.1.6"
celery-types = "^0.20.0"
flower = "^2.0.1"
types-xmltodict = "^0.13.0.3"