Skip to content

Moved the metadata into setup.cfg. - #156

Merged
nicoweidner merged 2 commits into
spdx:mainfrom
KOLANICH-libs:setup.cfg
Nov 7, 2022
Merged

Moved the metadata into setup.cfg.#156
nicoweidner merged 2 commits into
spdx:mainfrom
KOLANICH-libs:setup.cfg

Conversation

@KOLANICH

Copy link
Copy Markdown
Contributor

Added pyproject.toml.
Renamed console_scripts because their names are too generic to have this package installed into system.
Versions are now fetched from git tags.

@pombredanne pombredanne left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks! See my comments inline for you review.

Comment thread setup.cfg Outdated
Comment thread setup.cfg Outdated
Comment thread setup.cfg Outdated
Comment thread setup.cfg Outdated
Comment thread setup.cfg Outdated
Comment thread setup.py
Comment thread pyproject.toml Outdated
@pombredanne

Copy link
Copy Markdown
Member

@KOLANICH can you also add your DCO signoff? This was an informal requirement which was not consistently applied until now... this way I can then merge.

@pombredanne

Copy link
Copy Markdown
Member

This has been merged after a rebase.
Thanks!

@pombredanne pombredanne reopened this Jun 11, 2021
@pombredanne

Copy link
Copy Markdown
Member

Fat fingers!
Not merged yet. Sorry for the noise

@armintaenzertng

Copy link
Copy Markdown
Collaborator

@KOLANICH, do you still plan to address these change requests?

@pombredanne, are these changes still up-to-date?

@pombredanne

Copy link
Copy Markdown
Member

@pombredanne, are these changes still up-to-date?

I think they are... but your call to verify this.

@armintaenzertng

Copy link
Copy Markdown
Collaborator

Thanks @KOLANICH for updating this! :)

Removing setup.py seems like a breaking change, though, and CircleCI workflows also depend on it. I think keeping a minimal setup.py as Philippe suggested here would be the best option for now.

@armintaenzertng

Copy link
Copy Markdown
Collaborator

Thanks for the update, @KOLANICH!
CircleCI is still broken, though. Do you plan to look into this?

@armintaenzertng

Copy link
Copy Markdown
Collaborator

@pombredanne, this still has a blocker from you, would you mind to revisit/lift this? :)

Comment thread pyproject.toml
Comment thread pyproject.toml
Comment thread pyproject.toml
Comment thread setup.py
Comment thread pyproject.toml
Comment thread pyproject.toml Outdated
Comment thread pyproject.toml
@KOLANICH

Copy link
Copy Markdown
Contributor Author

just noting this is not mentioned at as belonging in project table at https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html#setuptools-specific-configuration

That doc mentions only setuptools-specific configuration. The most of pyproject.toml is the standardized one for all the major backends except poetry according to PEP 621.

And if we're renaming these, which IMO is a good idea as these names are too generic, can we please change "convertor" to "converter" in order to be using the main word in the dictionaries.

To be honest, convertor feels better for me and I guess for people too: searching in Bing (Google doesn't give out this info at least when JS is disabled) reveals:
convertor 566 000 000 results
converter 564 000 000 results

The rest of suggestions are implemented, thanks.

@jayvdb jayvdb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

There are still many other mentions of the CLI command names inside the codebase.

pdx/cli_tools/convertor.py:        ' convertor ---infile <input_file> ---outfile <output_file>.
spdx/cli_tools/convertor.py:        ' convertor -f/--from <type> <input_file> -t/--to <type> <output_file>.
spdx/cli_tools/convertor.py:        ' convertor -f/--from <type> <input_file> --outfile <output_file> '
spdx/cli_tools/convertor.py:        ' convertor --infile <input_file> -t/--to <type> <output_file>'
spdx/cli_tools/convertor.py:        raise ValueError("Given arguments for convertor are invalid.")
spdx/cli_tools/convertor.py:    To use : run 'convertor -f <from_TYPE> <input file> -t <to_TYPE> <output_file>' command on terminal or use ' convertor --infile <input file name> --outfile <output file name> '

nicoweidner
nicoweidner previously approved these changes Nov 3, 2022

@nicoweidner nicoweidner left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thanks for updating the setup scripts! I won't be able to merge until the appveyor issue is resolved, though...

@pombredanne Anything missing in your opinion? You are still set to "changes requested".

KOLANICH and others added 2 commits November 7, 2022 12:49
Added pyproject.toml.
Renamed console_scripts because their names are too generic to have this package installed into system.
Fixed the names of the commands within the docstrings.
Versions are now fetched from git tags.
Excluded the dirs that are not meant to go into wheels, like `examples/`.
Added the things jayvdb has suggested into the metadata.

Co-authored-by: John Vandenberg <[email protected]>
Signed-off-by: KOLANICH <[email protected]>
@nicoweidner
nicoweidner dismissed pombredanne’s stale review November 7, 2022 16:51

Asked for another opinion a while ago; reviewer stated (basically) that he won't be involved in a further review process in #156 (comment)

@nicoweidner nicoweidner left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thanks for rebasing again, @KOLANICH! I will go ahead and merge this before new conflicts arise

Comment thread pyproject.toml
urls = {Homepage = "https://github.com/spdx/tools-python"}
requires-python = ">=3.6"
dependencies = ["ply", "rdflib", "click", "pyyaml", "xmltodict"]
dynamic = ["version"]

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Didn't know about this, pretty cool!
In case anyone else stumbles across this: https://pypi.org/project/setuptools-scm/, look for "Default versioning scheme"

@nicoweidner
nicoweidner merged commit e6daf69 into spdx:main Nov 7, 2022
@jayvdb

jayvdb commented Dec 9, 2022

Copy link
Copy Markdown
Contributor

Please see #362

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.

5 participants