Skip to content

Commit

Permalink
Merge branch 'main' into issue-1145-consitent-docker-usernames
Browse files Browse the repository at this point in the history
  • Loading branch information
tejaswarathe authored Dec 5, 2024
2 parents 6855836 + 4785950 commit 93f24ba
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 66 deletions.
71 changes: 36 additions & 35 deletions api/pdm.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,27 @@ overrides = [
"-e openverse-attribution @ file:///${PROJECT_ROOT}/../packages/python/openverse-attribution"
]
dev = [
"ipython >=8.22.1, <9",
"debugpy >= 1.8.9, <2",
"ipython >=8.30.0, <9",
"pgcli >=4.1, <5",
"remote-pdb >=2.1.0, <3",
"setuptools >=75.2,<76",
"debugpy >= 1.8.9,<2",
"setuptools >=75.6, <76",
# FIXME: Should be removed when Python build issues are resolved,
# FIXME: since we don't explicitly use this library.
# FIXME: https://github.com/WordPress/openverse/issues/5146
"watchfiles>=0.24.0",
"watchfiles >=0.24.0",
]
test = [
"factory-boy >=3.3.0, <4",
"fakeredis >=2.21.3, <3",
"freezegun >=1.4.0, <2",
"pook >=2, <3",
"pytest >=8.3.3, <9",
"pytest-django >=4.8.0, <5",
"factory-boy >=3.3, <4",
"fakeredis >=2.26, <3",
"freezegun >=1.5, <2",
"pook >=2.1, <3",
"pytest >=8.3, <9",
"pytest-django >=4.9, <5",
"pytest-pook>=1.0.0",
"pytest-raises >=0.11, <0.12",
"pytest-sugar >=1, <1.1",
"schemathesis >=3.38.6, <4",
"schemathesis >=3.38, <4",
]

[tool.pytest.ini_options]
Expand Down
4 changes: 2 additions & 2 deletions documentation/meta/documentation/guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ maintainers which occurred after reading
These are some aspects to consider when starting the document.

**Type**: _(README, "Getting Started", Conceptual, Procedural
[tutorial/how-to/guide], Reference [API reference, Glossary,
Troubleshooting, Changelog])_\
[tutorial/how-to/guide], Reference [API reference, Glossary, Troubleshooting,
Changelog])_\
**Audience**:\
**Purpose**:\
**Title**:\
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@nuxtjs/robots": "^5.0.0",
"@nuxtjs/sitemap": "^7.0.0",
"@nuxtjs/tailwindcss": "^6.12.1",
"@pinia/nuxt": "^0.6.1",
"@pinia/nuxt": "^0.9.0",
"@sentry/node": "^8.26.0",
"@sentry/vue": "^8.26.0",
"@tailwindcss/typography": "^0.5.13",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@types/node": "^22.8.5",
"@openverse/eslint-plugin": "workspace:*",
"bindings": "1.5.0",
"prettier": "3.3.3",
"prettier": "3.4.2",
"prettier-plugin-tailwindcss": "0.6.9",
"typescript": "5.6.3",
"typescript-eslint": "^8.12.2",
Expand Down
31 changes: 15 additions & 16 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 93f24ba

Please sign in to comment.