-
Notifications
You must be signed in to change notification settings - Fork 156
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
Move all metadata to pyproject.toml #1026
Open
paulf81
wants to merge
9
commits into
NREL:develop
Choose a base branch
from
paulf81:feature/meta_pyproj
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+71
−96
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
7423023
Delete setup.py and version.py
paulf81 a484452
Update version to reference metadata
paulf81 ad212c1
All metadata in pyproject.toml
paulf81 389b7c1
Build without setup.py
paulf81 0c42134
Update dev guide
paulf81 7581a24
fix ref to flasc
paulf81 83d31b9
Add chris
paulf81 f35136d
Re-add package data
paulf81 f53b59c
Lower python req
paulf81 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,71 @@ | |
requires = ["setuptools >= 40.6.0", "wheel"] | ||
build-backend = "setuptools.build_meta" | ||
|
||
[project] | ||
name = "floris" | ||
version = "4.2" | ||
description = "A controls-oriented engineering wake model." | ||
readme = "README.md" | ||
requires-python = ">=3.8" | ||
authors = [ | ||
{ name = "Rafael Mudafort", email = "[email protected]" }, | ||
{ name = "Paul Fleming", email = "[email protected]" }, | ||
{ name = "Michael (Misha) Sinner", email = "[email protected]" }, | ||
{ name = "Eric Simley", email = "[email protected]" }, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Probably add Chris, too There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added! |
||
{ name = "Christopher Bay", email = "[email protected]" }, | ||
] | ||
license = { file = "LICENSE.txt" } | ||
keywords = ["floris"] | ||
classifiers = [ | ||
"License :: OSI Approved :: BSD License", | ||
"Programming Language :: Python", | ||
"Programming Language :: Python :: 3", | ||
"Programming Language :: Python :: 3.8", | ||
"Programming Language :: Python :: 3.9", | ||
"Programming Language :: Python :: 3.10", | ||
"Programming Language :: Python :: Implementation :: CPython", | ||
"Programming Language :: Python :: Implementation :: PyPy" | ||
] | ||
dependencies = [ | ||
"attrs", | ||
"pyyaml~=6.0", | ||
"numexpr~=2.0", | ||
"numpy~=1.20", | ||
"scipy~=1.1", | ||
"matplotlib~=3.0", | ||
"pandas~=2.0", | ||
"shapely~=2.0", | ||
"coloredlogs~=15.0", | ||
"pathos~=0.3", | ||
] | ||
|
||
[project.optional-dependencies] | ||
docs = [ | ||
"jupyter-book", | ||
"sphinx-book-theme", | ||
"sphinx-autodoc-typehints", | ||
"sphinxcontrib-autoyaml", | ||
"sphinxcontrib.mermaid", | ||
] | ||
develop = [ | ||
"pytest", | ||
"pre-commit", | ||
"ruff", | ||
"isort" | ||
] | ||
|
||
[tool.setuptools.packages.find] | ||
include = ["floris*"] | ||
|
||
[tool.setuptools.package-data] | ||
floris = [ | ||
"turbine_library/*.yaml", | ||
"core/wake_velocity/turbopark_lookup_table.mat" | ||
] | ||
|
||
[project.urls] | ||
Homepage = "https://github.com/NREL/floris" | ||
Documentation = "https://nrel.github.io/floris/" | ||
|
||
[coverage.run] | ||
# Coverage.py configuration file | ||
|
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is the change that hung us up over on FLASC---presumably as long as thee
python -m build
line runs below, it should upload to PyPI correctly?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's right, I think I've gotten to learn from that and now this should go off fine, easy to test locally too but you don't want to run the twine call
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, ok, makes sense
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want to fully test it, you could use the TestPyPI instance. If you did that, you could create a release on your fork and see that it uploads correctly without affecting anything on the primary repository.
Also heads up that this pull request is pointing to
main
rather thandevelop
. Maybe that was intentional, but just pointing it out in case it wasn't.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should've been develop, moved over now