Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ci tests #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix ci tests #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI
on:
push:
branches: [ "master" ]
branches: [ "**" ]
pull_request:
branches: [ "**" ]
jobs:
Expand All @@ -15,7 +15,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixos-unstable
nix_path: nixpkgs=channel:nixos-20.09
- uses: cachix/cachix-action@v8
with:
name: nixops-digitalocean
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixos-unstable
nix_path: nixpkgs=channel:nixos-20.09
- uses: cachix/cachix-action@v8
with:
name: nixops-digitalocean
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixos-unstable
nix_path: nixpkgs=channel:nixos-20.09
- uses: cachix/cachix-action@v8
with:
name: nixops-digitalocean
Expand All @@ -72,7 +72,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixos-unstable
nix_path: nixpkgs=channel:nixos-20.09
- uses: cachix/cachix-action@v8
with:
name: nixops-digitalocean
Expand All @@ -91,7 +91,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixos-unstable
nix_path: nixpkgs=channel:nixos-20.09
- uses: cachix/cachix-action@v8
with:
name: nixops-digitalocean
Expand All @@ -110,7 +110,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixos-unstable
nix_path: nixpkgs=channel:nixos-20.09
- uses: cachix/cachix-action@v8
with:
name: nixops-digitalocean
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixos-unstable
nix_path: nixpkgs=channel:nixos-20.09
- uses: cachix/cachix-action@v8
with:
name: nixops-digitalocean
Expand All @@ -165,7 +165,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixos-unstable
nix_path: nixpkgs=channel:nixos-20.09
- uses: cachix/cachix-action@v8
with:
name: nixops-digitalocean
Expand All @@ -184,7 +184,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixos-unstable
nix_path: nixpkgs=channel:nixos-20.09
- uses: cachix/cachix-action@v8
with:
name: nixops-digitalocean
Expand Down
1 change: 1 addition & 0 deletions ci/check-flake8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env nix-shell
# shellcheck shell=bash
#!nix-shell ../shell.nix -i bash

exec flake8 nixops_digitalocean tests/unit
1 change: 1 addition & 0 deletions ci/check-formatting.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env nix-shell
# shellcheck shell=bash
#!nix-shell ../shell.nix -i bash

black . --check --diff
1 change: 1 addition & 0 deletions ci/check-mypy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env nix-shell
# shellcheck shell=bash
#!nix-shell ../shell.nix -i bash

mypy nixops_digitalocean
314 changes: 266 additions & 48 deletions doc/requirements.txt
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
{ pkgs }:

self: super: {
nixops = super.nixops.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: {
format = "pyproject";
nativeBuildInputs = nativeBuildInputs ++ [
self.pluggy
self.poetry
self.prettytable
self.prettytable
self.typeguard
self.typing-extensions
];
propagatedBuildInputs = [ self.setuptools ];
});
sphinx = super.sphinx.overridePythonAttrs
({ propagatedBuildInputs ? [ ], ... }: {
propagatedBuildInputs = propagatedBuildInputs
++ [ self.setuptools self.wheel self.pip ];
});
zipp = super.zipp.overridePythonAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.toml ];
});
mypy = super.mypy.overridePythonAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs
++ [ self.lxml self.pip self.setuptools ];
});
}
Loading