Skip to content
Open
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
2 changes: 1 addition & 1 deletion extra/experimentation/shell.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ pkgs ? import ./nixpkgs-pinned.nix {} }:
pkgs.mkShell rec {
python = pkgs.python311.withPackages (ps: [
python = pkgs.python313.withPackages (ps: [
ps.fastapi
ps.google-cloud-storage
ps.httpx
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ test-integration *TEST_ARGS: build-bin build-python
# Python integration test suite, using artefacts built through Nix. Args are forwarded to pytest
[group('nix')]
nix-test-integration *TEST_ARGS: nix-build-bin
nix-test-integration *TEST_ARGS: nix-build
#!/usr/bin/env bash
set -euo pipefail
nix_build_python_library_dir=$(just nix-build-python)
Expand Down
4 changes: 2 additions & 2 deletions libs/opsqueue_python/examples/tracing/tracing_producer.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import logging
import typing
import opentelemetry
import opentelemetry.context
from opentelemetry.context import Context

import contextlib
from typing import Optional, Generator
from opentelemetry import trace
from opentelemetry import baggage as otel_baggage
from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export import (
BatchSpanProcessor,
Expand Down Expand Up @@ -66,7 +66,7 @@ def added_baggage(

if baggage:
for key, value in baggage.items():
attached_token = opentelemetry.baggage.set_baggage(key, value, context)
attached_token = otel_baggage.set_baggage(key, value, context)
attached_context_tokens.append(
typing.cast(Context, opentelemetry.context.attach(attached_token))
)
Expand Down
2 changes: 1 addition & 1 deletion libs/opsqueue_python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license="MIT"
keywords=["queue", "processing", "paralellism", "distributed", "batch", "producer", "consumer"]


requires-python = ">=3.8"
requires-python = ">=3.13"
classifiers = [
"Programming Language :: Rust",
"Programming Language :: Python :: Implementation :: CPython",
Expand Down
1 change: 0 additions & 1 deletion nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ in
python = python3;

opsqueue = final.callPackage ../opsqueue/opsqueue.nix { };

}
6 changes: 3 additions & 3 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6308c3b21396534d8aaeac46179c14c439a89b8a",
"sha256": "14qnx22pkl9v4r0lxnnz18f4ybxj8cv18hyf1klzap98hckg58y4",
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"sha256": "1vq77hlx8mi3z03pw2nf6r5h7473r1p9yxyf58ym3fh01zppmfln",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/6308c3b21396534d8aaeac46179c14c439a89b8a.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/567a49d1913ce81ac6e9582e3553dd90a955875f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"rust-overlay": {
Expand Down
3 changes: 1 addition & 2 deletions nix/util.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Utility functions to use in nix code
{ lib }:
{
{ lib }: {
# A powerful way of filtering the right files for the src attribute of a derivation.
fileFilter =
{
Expand Down
12 changes: 12 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[project]
name = "opsqueue"
description = "Top level python settings to prevent python tooling from looking further up the directory tree for a pyproject.toml"
version = "0.1.0"
readme = "README.md"
requires-python = ">= 3.13"

[tool.mypy]
strict = true
follow_imports = "normal"
show_error_codes = true
warn_unused_configs = true
Comment on lines +1 to +12
9 changes: 9 additions & 0 deletions ruff.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
line-length = 88
target-version = "py313"

[format]
quote-style = "double"
indent-style = "space"
line-ending = "lf"
docstring-code-format = true
docstring-code-line-length = "dynamic"
Loading