-
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
base: develop
Are you sure you want to change the base?
Changes from 5 commits
7423023
a484452
ad212c1
389b7c1
0c42134
7581a24
83d31b9
f35136d
f53b59c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
|
||
from importlib.metadata import version | ||
from pathlib import Path | ||
|
||
|
||
with open(Path(__file__).parent / "version.py") as _version_file: | ||
__version__ = _version_file.read().strip() | ||
__version__ = version("flasc") | ||
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. 😮 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. Fixed sorry for that one! |
||
|
||
|
||
from .floris_model import FlorisModel | ||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,64 @@ | |
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.9" | ||
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! |
||
] | ||
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*"] | ||
|
||
[project.urls] | ||
Homepage = "https://github.com/NREL/floris" | ||
Documentation = "https://nrel.github.io/floris/" | ||
|
||
[coverage.run] | ||
# Coverage.py configuration file | ||
|
This file was deleted.
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