Skip to content

cleanups from PR #550

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

Merged
chrisaddy merged 1 commit into from
May 22, 2025
Merged

cleanups from PR #550

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
250 changes: 0 additions & 250 deletions .flox/env/manifest.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"manifest": {
"version": 1,
"install": {
"libpqxx": {
"pkg-path": "libpqxx"
},
"mise": {
"pkg-path": "mise"
},
Expand All @@ -15,9 +12,6 @@
"pulumi-python": {
"pkg-path": "pulumiPackages.pulumi-python"
},
"pulumictl": {
"pkg-path": "pulumictl"
},
"ruff": {
"pkg-path": "ruff"
},
Expand All @@ -41,130 +35,6 @@
}
},
"packages": [
{
"attr_path": "libpqxx",
"broken": false,
"derivation": "/nix/store/w9lvn6s828mpwq6b3pqv0hizsfzwhgjm-libpqxx-7.10.1.drv",
"description": "C++ library to access PostgreSQL databases",
"install_id": "libpqxx",
"license": "BSD-3-Clause",
"locked_url": "https://github.com/flox/nixpkgs?rev=979daf34c8cacebcd917d540070b52a3c2b9b16e",
"name": "libpqxx-7.10.1",
"pname": "libpqxx",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"rev_count": 793735,
"rev_date": "2025-05-04T03:14:55Z",
"scrape_date": "2025-05-05T04:19:30.069215Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "7.10.1",
"outputs_to_install": [
"out"
],
"outputs": {
"dev": "/nix/store/zhxb9605ws89rzy1rh7c43a5q6l2fksd-libpqxx-7.10.1-dev",
"out": "/nix/store/qznww33gb7ym7jnd3i4raxwagd059fir-libpqxx-7.10.1"
},
"system": "aarch64-darwin",
"group": "toplevel",
"priority": 5
},
{
"attr_path": "libpqxx",
"broken": false,
"derivation": "/nix/store/yv2vasrkh611sh8liv2lx361n9bn82ag-libpqxx-7.10.1.drv",
"description": "C++ library to access PostgreSQL databases",
"install_id": "libpqxx",
"license": "BSD-3-Clause",
"locked_url": "https://github.com/flox/nixpkgs?rev=979daf34c8cacebcd917d540070b52a3c2b9b16e",
"name": "libpqxx-7.10.1",
"pname": "libpqxx",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"rev_count": 793735,
"rev_date": "2025-05-04T03:14:55Z",
"scrape_date": "2025-05-05T04:37:23.298189Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "7.10.1",
"outputs_to_install": [
"out"
],
"outputs": {
"dev": "/nix/store/4fafh1bc0varik2d6wngd20mn3fwkzmc-libpqxx-7.10.1-dev",
"out": "/nix/store/d727l5xl8khnzrkgd8x7p7hy7v1apn4q-libpqxx-7.10.1"
},
"system": "aarch64-linux",
"group": "toplevel",
"priority": 5
},
{
"attr_path": "libpqxx",
"broken": false,
"derivation": "/nix/store/l8bwf0cl29np6xi1kyvgkvb5jnv4a1w3-libpqxx-7.10.1.drv",
"description": "C++ library to access PostgreSQL databases",
"install_id": "libpqxx",
"license": "BSD-3-Clause",
"locked_url": "https://github.com/flox/nixpkgs?rev=979daf34c8cacebcd917d540070b52a3c2b9b16e",
"name": "libpqxx-7.10.1",
"pname": "libpqxx",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"rev_count": 793735,
"rev_date": "2025-05-04T03:14:55Z",
"scrape_date": "2025-05-05T04:54:30.752025Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "7.10.1",
"outputs_to_install": [
"out"
],
"outputs": {
"dev": "/nix/store/72i3bj360rp5kp2rbfkrb9267raqpbxi-libpqxx-7.10.1-dev",
"out": "/nix/store/xlzlkln61251vl4vdhzcgiv03krq4d7s-libpqxx-7.10.1"
},
"system": "x86_64-darwin",
"group": "toplevel",
"priority": 5
},
{
"attr_path": "libpqxx",
"broken": false,
"derivation": "/nix/store/3cnj26fkyk7yvkzbkq9ricckz2x3lg46-libpqxx-7.10.1.drv",
"description": "C++ library to access PostgreSQL databases",
"install_id": "libpqxx",
"license": "BSD-3-Clause",
"locked_url": "https://github.com/flox/nixpkgs?rev=979daf34c8cacebcd917d540070b52a3c2b9b16e",
"name": "libpqxx-7.10.1",
"pname": "libpqxx",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"rev_count": 793735,
"rev_date": "2025-05-04T03:14:55Z",
"scrape_date": "2025-05-05T05:15:58.462220Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "7.10.1",
"outputs_to_install": [
"out"
],
"outputs": {
"dev": "/nix/store/n3rb5ag633fj1fpkkb17dc826g3k2yh7-libpqxx-7.10.1-dev",
"out": "/nix/store/dxbnd3lixj1273hdfqpdvyb7v9w4da6m-libpqxx-7.10.1"
},
"system": "x86_64-linux",
"group": "toplevel",
"priority": 5
},
{
"attr_path": "mise",
"broken": false,
Expand Down Expand Up @@ -525,126 +395,6 @@
"group": "toplevel",
"priority": 5
},
{
"attr_path": "pulumictl",
"broken": false,
"derivation": "/nix/store/kx43jzcfslw28byvs6h5ngsgl432pvvv-pulumictl-0.0.49.drv",
"description": "Swiss Army Knife for Pulumi Development",
"install_id": "pulumictl",
"license": "Apache-2.0",
"locked_url": "https://github.com/flox/nixpkgs?rev=979daf34c8cacebcd917d540070b52a3c2b9b16e",
"name": "pulumictl-0.0.49",
"pname": "pulumictl",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"rev_count": 793735,
"rev_date": "2025-05-04T03:14:55Z",
"scrape_date": "2025-05-05T04:19:37.687142Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "0.0.49",
"outputs_to_install": [
"out"
],
"outputs": {
"out": "/nix/store/ny69c9bfkf4w179240ch45injfb2ajqr-pulumictl-0.0.49"
},
"system": "aarch64-darwin",
"group": "toplevel",
"priority": 5
},
{
"attr_path": "pulumictl",
"broken": false,
"derivation": "/nix/store/www9nfncvv7l339n8dks22x5vs5lz1mk-pulumictl-0.0.49.drv",
"description": "Swiss Army Knife for Pulumi Development",
"install_id": "pulumictl",
"license": "Apache-2.0",
"locked_url": "https://github.com/flox/nixpkgs?rev=979daf34c8cacebcd917d540070b52a3c2b9b16e",
"name": "pulumictl-0.0.49",
"pname": "pulumictl",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"rev_count": 793735,
"rev_date": "2025-05-04T03:14:55Z",
"scrape_date": "2025-05-05T04:37:42.118866Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "0.0.49",
"outputs_to_install": [
"out"
],
"outputs": {
"out": "/nix/store/xpdh5dijdki4cngh7k7n4rg84i6c28zs-pulumictl-0.0.49"
},
"system": "aarch64-linux",
"group": "toplevel",
"priority": 5
},
{
"attr_path": "pulumictl",
"broken": false,
"derivation": "/nix/store/17wf5x1kk3v5ch5npwhamnix629y07wg-pulumictl-0.0.49.drv",
"description": "Swiss Army Knife for Pulumi Development",
"install_id": "pulumictl",
"license": "Apache-2.0",
"locked_url": "https://github.com/flox/nixpkgs?rev=979daf34c8cacebcd917d540070b52a3c2b9b16e",
"name": "pulumictl-0.0.49",
"pname": "pulumictl",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"rev_count": 793735,
"rev_date": "2025-05-04T03:14:55Z",
"scrape_date": "2025-05-05T04:54:38.447587Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "0.0.49",
"outputs_to_install": [
"out"
],
"outputs": {
"out": "/nix/store/6wmig1w7f3vmfrlyg2qzv21bvacj3as8-pulumictl-0.0.49"
},
"system": "x86_64-darwin",
"group": "toplevel",
"priority": 5
},
{
"attr_path": "pulumictl",
"broken": false,
"derivation": "/nix/store/ib7hqxg7xdf5kyh78jqggzdcs97q1224-pulumictl-0.0.49.drv",
"description": "Swiss Army Knife for Pulumi Development",
"install_id": "pulumictl",
"license": "Apache-2.0",
"locked_url": "https://github.com/flox/nixpkgs?rev=979daf34c8cacebcd917d540070b52a3c2b9b16e",
"name": "pulumictl-0.0.49",
"pname": "pulumictl",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"rev_count": 793735,
"rev_date": "2025-05-04T03:14:55Z",
"scrape_date": "2025-05-05T05:16:19.858098Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "0.0.49",
"outputs_to_install": [
"out"
],
"outputs": {
"out": "/nix/store/rmh9mjkxijxcc7cvjhsqc9657fbw0yyg-pulumictl-0.0.49"
},
"system": "x86_64-linux",
"group": "toplevel",
"priority": 5
},
{
"attr_path": "ruff",
"broken": false,
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,13 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# os: [macos-latest] # ubuntu-latest should be included once C++ dependencies are fixed
os: [ubuntu-latest] # ubuntu-latest should be included once C++ dependencies are fixed
# os: [macos-latest]
os: [ubuntu-latest]
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Install Flox
uses: flox/install-flox-action@v2
# - name: Install libstdc++
# run: |
# sudo apt-get update
# sudo apt-get install -y lib32stdc++6
- name: Install Python dependencies
uses: flox/activate-action@v1
with:
Expand Down
26 changes: 13 additions & 13 deletions .mise.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,50 +52,50 @@ uv run coverage xml \
[tasks."python:test:behave"]
description = "Run behave end-to-end tests"
run = """
cd application/{{arg(name="application_name")}}
cd application/{{arg(name="service_name")}}
uv run behave features/
"""


[tasks."application:build"]
[tasks."application:service:build"]
description = "Build the application service"
run = """
TIMESTAMP=$(date +%Y%m%d)
docker build \
--file application/{{arg(name="application_name")}}/Dockerfile \
--tag pocketsizefund/{{arg(name="application_name")}}:latest \
--tag pocketsizefund/{{arg(name="application_name")}}:${TIMESTAMP} \
--file application/{{arg(name="service_name")}}/Dockerfile \
--tag pocketsizefund/{{arg(name="service_name")}}:latest \
--tag pocketsizefund/{{arg(name="service_name")}}:${TIMESTAMP} \
.
"""

[tasks."application:run"]
[tasks."application:service:run"]
description = "Run the application service"
run = """
docker run \
--env-file .env \
--publish 8080:8080 \
pocketsizefund/{{arg(name="application_name")}}:latest \
pocketsizefund/{{arg(name="service_name")}}:latest \
"""

[tasks."application:dev"]
[tasks."application:service:development"]
description = "Run the application service locally with hot reloading"
run = """
cd application/{{arg(name="application_name")}}
uv run uvicorn src.{{arg(name="application_name")}}.main:application --reload
cd application/{{arg(name="service_name")}}
uv run uvicorn src.{{arg(name="service_name")}}.main:application --reload
"""

[tasks."application:test"]
[tasks."application:service:test"]
description = "Run integration tests"
run = """
cd application/{{arg(name="application_name")}}
cd application/{{arg(name="service_name")}}
docker-compose up --build --abort-on-container-exit --remove-orphans
"""

[tasks."lint"]
depends = ["python:lint"]
description = "Run code quality checks"
run = """
yamllint .
yamllint -d "{extends: relaxed, rules: {line-length: {max: 110}}}" .
"""

[tasks."infrastructure:up"]
Expand Down
Loading
Loading