Skip to content

Commit

Permalink
🚧 Use branches with missing migrations
Browse files Browse the repository at this point in the history
  • Loading branch information
pajowu committed Jan 30, 2025
1 parent 5884427 commit 3fb99de
Show file tree
Hide file tree
Showing 8 changed files with 1,379 additions and 459 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
run: uv run python manage.py compilemessages -i node_modules
- name: Check for missing migrations
run: |
uv run python manage.py makemigrations --check
uv run python manage.py makemigrations --check -v3
- name: Run tests
run: |
uv run coverage run --branch -m pytest --reuse-db
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@
},
"dependencies": {
"@glidejs/glide": "^3.6.2",
"@okfde/filingcabinet": "github:okfde/django-filingcabinet",
"@okfde/filingcabinet": "github:okfde/django-filingcabinet#pajowu/missing_migrations",
"@popperjs/core": "^2.11.8",
"@sentry/browser": "^7.119.0",
"@sentry/integrations": "^7.114.0",
"@sentry/tracing": "^7.114.0",
"bootstrap": "^5.3.3",
"font-awesome": "^4.7.0",
"froide": "github:okfde/froide",
"froide_campaign": "github:okfde/froide-campaign",
"froide_exam": "github:okfde/froide-exam",
"froide": "github:okfde/froide#pajowu/missing_migrations",
"froide_campaign": "github:okfde/froide-campaign#pajowu/missing_migrations",
"froide_exam": "github:okfde/froide-exam#pajowu/missing_migrations",
"froide_food": "github:okfde/froide-food",
"froide_legalaction": "github:okfde/froide-legalaction",
"froide_legalaction": "github:okfde/froide-legalaction#pajowu/missing_migrations",
"froide_payment": "github:okfde/froide-payment",
"vega": "^5.30.0",
"vega-embed": "6.19.1",
"vega-interpreter": "^1.0.5",
"vega-lite": "^5.21.0"
},
"prettier": "prettier-config-standard"
}
}
960 changes: 612 additions & 348 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies = [
"django-datashow>=0.1.3",
"django-elasticsearch-dsl>=8.0,<9.0",
"django-filer>=3.0.0",
"django-filingcabinet @ git+https://github.com/okfde/django-filingcabinet.git@main",
"django-filingcabinet @ git+https://github.com/okfde/django-filingcabinet.git@pajowu/missing_migrations",
"django-filter<24.1",
"django-floppyforms>=1.9.0",
"django-json-widget>=2.0.1",
Expand Down Expand Up @@ -92,20 +92,20 @@ dependencies = [
"webp>=0.4.0",
"websockets>=13.0.1",
"django-amenities @ git+https://github.com/okfde/django-amenities.git@main",
"froide @ git+https://github.com/okfde/froide.git@main",
"froide-campaign @ git+https://github.com/okfde/froide-campaign.git@main",
"froide @ git+https://github.com/okfde/froide.git@pajowu/missing_migrations",
"froide-campaign @ git+https://github.com/okfde/froide-campaign.git@pajowu/missing_migrations",
"froide-food @ git+https://github.com/okfde/froide-food.git@main",
"froide-fax @ git+https://github.com/okfde/froide-fax.git@main",
"froide-legalaction @ git+https://github.com/okfde/froide-legalaction.git@main",
"froide-exam @ git+https://github.com/okfde/froide-exam.git@main",
"froide-legalaction @ git+https://github.com/okfde/froide-legalaction.git@pajowu/missing_migrations",
"froide-exam @ git+https://github.com/okfde/froide-exam.git@pajowu/missing_migrations",
"froide-payment @ git+https://github.com/okfde/froide-payment.git@main",
"froide-crowdfunding @ git+https://github.com/okfde/froide-crowdfunding.git@main",
"froide-govplan @ git+https://github.com/okfde/froide-govplan.git@main",
"sortabletable @ git+https://github.com/stefanw/djangocms-sortabletable.git@main",
"sortabletable @ git+https://github.com/pajowu/djangocms-sortabletable.git@pajowu/missing_migrations",
"djangocms-transfer @ git+https://github.com/stefanw/djangocms-transfer.git",
"django-legal-advice-builder @ git+https://github.com/fragdenstaat/django-legal-advice-builder.git@main",
"fcdocs-annotate @ git+https://github.com/okfde/fcdocs-annotate.git@main",
"froide-evidencecollection[gsheets] @ git+https://github.com/okfde/froide-evidencecollection.git@main",
"django-legal-advice-builder @ git+https://github.com/fragdenstaat/django-legal-advice-builder.git@pajowu/missing_migrations",
"fcdocs-annotate @ git+https://github.com/okfde/fcdocs-annotate.git@pajowu/missing_migrations",
"froide-evidencecollection[gsheets] @ git+https://github.com/okfde/froide-evidencecollection.git@pajowu/missing_migrations",
]

[project.optional-dependencies]
Expand Down
Loading

0 comments on commit 3fb99de

Please sign in to comment.