Skip to content
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.

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

Update requirements #5

Merged
merged 6 commits into from
May 29, 2024
Merged

Update requirements #5

merged 6 commits into from
May 29, 2024

Conversation

ColeDCrawford
Copy link

Change Summary

This PR adds some upstream changes. It also makes the requirements.txt dependencies more flexible, so that when Catchpy is installed as a package in an existing project it is less likely to throw dependency tree resolution errors.

Related issue number

Related to DAR-422 (Upgrading MCH Python packages)

Checklist

  • PR title is descriptive
  • Added/Modified tests for the changes (or explain why not relevant)
  • Manually tested the changes and investigated potential regressions
  • Documented changes (where applicable)

nmaekawa and others added 5 commits April 4, 2024 17:43
- adjusts docker-compose to align with hxat project
Make the requirements.txt more flexible, so other applications can more easily incorporate Catchpy.
3.12 was failing to install (pointing at old beta).

Could move to a GHA matrix strategy instead of tox.
@ColeDCrawford ColeDCrawford requested a review from d-flood May 29, 2024 16:07
Copy link

@d-flood d-flood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, my only comment is about the README. I think it makes sense to make make the requirements more flexible, especially when catchpy is used as a dependency in a larger Django project.

README.rst Outdated
Comment on lines 40 to 43
$> docker compose up
$> docker compose exec web python manage.py migrate
$> docker compose exec web python manage.py createsuperuser
$> open http://localhost:8000/static/anno/index.html
$> docker-compose up
$> docker-compose exec web python manage.py migrate
$> docker-compose exec web python manage.py createsuperuser
$> open http://localhost:9000/static/anno/index.html
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the legacy docker-compose command got put back in. I think Docker will soon stop shipping with the legacy command. It is not just syntax, docker-compose is a different CLI.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the docker commands.

@d-flood d-flood merged commit b0d9a19 into django-package May 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants