Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 5 additions & 10 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Pytest Checks

on:
push:
branches:
Expand All @@ -8,7 +7,6 @@ on:
# branches:
# - main
# - develop

jobs:
test:
runs-on: ubuntu-latest
Expand All @@ -17,14 +15,11 @@ jobs:
python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v2
- name: Install uv
uses: astral-sh/setup-uv@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
run: uv python install ${{ matrix.python-version }}
- name: Install dependencies
run: |
pip install poetry
poetry install --no-interaction
run: uv sync
- name: Run Tests
run: |
poetry run pytest
run: uv run pytest
32 changes: 14 additions & 18 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This workflow will upload a Python Package using Twine when a release is created
# This workflow will upload a Python Package using uv when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
Expand All @@ -18,21 +17,18 @@ permissions:

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install poetry
pip install .
- name: Configure TOKEN
run: poetry config pypi-token.pypi ${{ secrets.PYPI_API_TOKEN }}
- name: Publish package
run: poetry publish --build
- uses: actions/checkout@v4
- name: Install uv
uses: astral-sh/setup-uv@v4
with:
enable-cache: true
- name: Set up Python
run: uv python install
- name: Build package
run: uv build
- name: Publish package
env:
UV_PUBLISH_TOKEN: ${{ secrets.UV_PUBLISH_TOKEN }}
run: uv publish
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

# 3.3.4

- Fixed a but where keybind where freezing the ui (#246)

# 3.3.3

### Added
Expand Down
7 changes: 4 additions & 3 deletions dooit/__main__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from pathlib import Path
from typing import Optional

import click
from pathlib import Path
from platformdirs import user_data_dir, user_config_dir
from platformdirs import user_config_dir, user_data_dir

OLD_CONFIG = Path(user_data_dir("dooit")) / "todo.yaml"
VERSION = "3.3.3"
VERSION = "3.3.4"


def run_dooit(config: Optional[str] = None, db_path: Optional[str] = None):
Expand Down
61 changes: 39 additions & 22 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,51 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};

outputs = {
self,
nixpkgs,
...
}: let
forEachSystem = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all;
outputs =
{
self,
nixpkgs,
...
}:
let
forEachSystem = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all;

pkgsFor = forEachSystem (
system:
pkgsFor = forEachSystem (
system:
import nixpkgs {
inherit system;
}
);
);

packageFor = system: pkgsFor.${system}.callPackage ./nix {};
in {
packages = forEachSystem (
system: {
packageFor = system: pkgsFor.${system}.callPackage ./nix { };
in
{
packages = forEachSystem (system: {
default = packageFor system;
}
);
overlay = final: prev: {
dooit = packageFor final.system;
};
});
overlay = final: prev: {
dooit = packageFor final.system;
};

homeManagerModules = {
default = self.homeManagerModules.dooit;
dooit = import ./nix/hm-module.nix self;
};

homeManagerModules = {
default = self.homeManagerModules.dooit;
dooit = import ./nix/hm-module.nix self;
devShells = forEachSystem (
system:
let
pkgs = pkgsFor.${system};
in
{
default = pkgs.mkShell {
buildInputs = with pkgs; [
nodejs
nodePackages.yarn
nodePackages.npm
];
};
}
);
};
};
}
1 change: 1 addition & 0 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ python3.pkgs.buildPythonApplication rec {

checkInputs = with python3.pkgs; [
pytestCheckHook
pytest-asyncio
faker
];

Expand Down
Loading