Skip to content

Conversation

sei-renae
Copy link
Contributor

@sei-renae sei-renae commented Sep 19, 2025

Resolves #974

@sei-renae sei-renae marked this pull request as ready for review September 19, 2025 16:39
Copy link
Contributor

@sei-vsarvepalli sei-vsarvepalli left a comment

Choose a reason for hiding this comment

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

sure thing.

Copy link
Contributor

@ahouseholder ahouseholder left a comment

Choose a reason for hiding this comment

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

I don't see any changes to docker/Dockerfile or Makefile. Those will break if left unmodified.

[tool.setuptools.packages.find]
where = ["."] # list of folders that contain the packages (["."] by default)
include = ["ssvc*"] # package names should match these glob patterns (["*"] by default)
include = ["src*"] # package names should match these glob patterns (["*"] by default)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we might want this to be src/ssvc/* ?

Copy link
Contributor

Choose a reason for hiding this comment

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

or maybe it's where = ["./src"] and leave include = ["ssvc*"] ?

Copy link
Contributor Author

@sei-renae sei-renae Sep 19, 2025

Choose a reason for hiding this comment

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

All 3 options successfully run uv sync

@ahouseholder ahouseholder marked this pull request as draft September 19, 2025 18:17
@sei-renae
Copy link
Contributor Author

I don't see any changes to docker/Dockerfile or Makefile. Those will break if left unmodified.
@ahouseholder
Interestingly, without changes to either file, make docs built and ran on localhost without issue.
docker compose up -d does fail- I'll fix that.

@sei-vsarvepalli
Copy link
Contributor

I don't see any changes to docker/Dockerfile or Makefile. Those will break if left unmodified.
@ahouseholder
Interestingly, without changes to either file, make docs built and ran on localhost without issue.
docker compose up -d does fail- I'll fix that.

good catch. Didn't run docker...

@ahouseholder
Copy link
Contributor

Before we're done here, we should also:

  • change dependabot.yml to use uv instead of pip as the package-ecosystem
  • remove requirements.txt since everything going forward should depend on pyproject.toml

@ahouseholder
Copy link
Contributor

Also note that the Makefile uses docker-compose for many of its targets, so it's possible that unless you're removing previously composed images the make tasks might not reflect the current configuration and instead are basically running cached images. I think make clean takes care of this, but if it doesn't we should fix that too.

@ahouseholder
Copy link
Contributor

ahouseholder commented Sep 29, 2025

Before we're done here, we should also:

  • change dependabot.yml to use uv instead of pip as the package-ecosystem
  • remove requirements.txt since everything going forward should depend on pyproject.toml

On this front, #986 makes the cut over to uv but since this is changing the location of pyproject.toml we'll still need to update it for that. (remove - "/src" from directories:)

@sei-renae
Copy link
Contributor Author

On this front, #986 makes the cut over to uv but since this is changing the location of pyproject.toml we'll still need to update it for that. (remove - "/src" from directories:)

How did #986 not break dependabot?

@ahouseholder
Copy link
Contributor

How did #986 not break dependabot?

I think basically this line?
https://github.com/CERTCC/SSVC/pull/986/files#diff-dd4fbda47e51f1e35defb9275a9cd9c212ecde0b870cba89ddaaae65c5f3cd28R9

I added the /src to tell Dependabot where to look for pyproject.toml.

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.

Move /src/pyproject.toml to /pyproject.toml

3 participants