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

Fix license classifier #982

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Fix license classifier #982

merged 1 commit into from
Jan 7, 2025

Conversation

ktbyers
Copy link
Collaborator

@ktbyers ktbyers commented Jan 5, 2025

This change is needed for the Nornir 3.5.0 release (as pypi is rejected the classifier that we specified in #976)

@ktbyers
Copy link
Collaborator Author

ktbyers commented Jan 5, 2025

This PR reverts the classifier part of this PR (as it was incorrect):

#976

@ktbyers
Copy link
Collaborator Author

ktbyers commented Jan 5, 2025

Additional notes:

Pypi rejected uploaded of Nornir 3.5.0 with:

WARNING  Error during upload. Retry with the --verbose option for more details.                                                     
ERROR    HTTPError: 400 Bad Request from https://upload.pypi.org/legacy/                                                            
         'License :: OSI Approved :: Apache Software License 2.0 (Apache-2.0)' is not a valid classifier. See                       
         https://packaging.python.org/specifications/core-metadata for more information.

Also the classifier never accepted the change that was in the referenced issue (see):

https://github.com/pypa/trove-classifiers/blob/main/src/trove_classifiers/__init__.py#L283

@ktbyers
Copy link
Collaborator Author

ktbyers commented Jan 5, 2025

I checked both the METADATA file and the PKG-INFO file and the Properietary License referfence was gone (after reverting the classifier part of this).

So the original issue #975 should still be fixed.

@coveralls
Copy link

Pull Request Test Coverage Report for Build 12622031701

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 56.799%

Totals Coverage Status
Change from base Build 12621529027: 0.0%
Covered Lines: 543
Relevant Lines: 956

💛 - Coveralls

@ogenstad
Copy link
Collaborator

ogenstad commented Jan 7, 2025

So we think that the initial issue might have been resolved by this change:

-license = "Apache 2.0"
+license = "Apache-2.0"

But that other metadata change caused some other violation?

@ktbyers
Copy link
Collaborator Author

ktbyers commented Jan 7, 2025

@ogenstad Yes, the hyphen fixed the original METADATA issue (I verified this).

The classifier change was wrong and broke the pypi upload.

@ktbyers ktbyers merged commit fd5b124 into main Jan 7, 2025
32 checks passed
@ktbyers ktbyers deleted the fix_license_classifier branch January 7, 2025 16:04
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.

4 participants