Skip to content

Update for compatibility with Cherab core 1.5. #74

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.

Sign up for GitHub

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

Merged
jacklovell merged 1 commit into from
Aug 28, 2024
+6 −6
Merged

Update for compatibility with Cherab core 1.5. #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[build-system]
requires = ["setuptools", "wheel", "oldest-supported-numpy", "cython==3.0a5", "raysect==0.7.1", "cherab==1.4"]
requires = ["setuptools", "oldest-supported-numpy", "cython~=3.0", "raysect==0.8.1.*", "cherab==1.5.*"]
build-backend="setuptools.build_meta"
6 changes: 3 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cherab==1.4.0
raysect==0.7.1
cython==3.0a5
cherab==1.5.*
raysect==0.8.1.*
cython~=3.0
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

setup(
name="cherab-solps",
version="1.2.1",
version="1.3.0.dev1",
license="EUPL 1.1",
namespace_packages=['cherab'],
description="Cherab spectroscopy framework: SOLPS submodule",
Expand All @@ -63,6 +63,6 @@
long_description_content_type="text/markdown",
packages=find_packages(),
include_package_data=True,
install_requires=["raysect==0.7.1", "cherab==1.4"],
install_requires=["raysect==0.8.1.*", "cherab==1.5.*"],
Copy link
Copy Markdown
Member

@vsnever vsnever Aug 28, 2024

Choose a reason for hiding this comment

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

Thanks for this, @jacklovell.
All is well, except do we actually need raysect==0.8.1.* in install_requires if we already have cherab==1.5.* which will install it anyway?

Copy link
Copy Markdown
Member Author

@jacklovell jacklovell Aug 28, 2024

Choose a reason for hiding this comment

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

There are places in cherab-solps that directly use Raysect, e.g.:

solps/cherab/solps/solps_2d_functions.pyx

Line 24 in aecedf2

from raysect.core.math.function.float.function2d.interpolate.common cimport MeshKDTree2D

I think it's good practice to explicitly state the dependency for this package rather than relying on another dependency package to satisfy it for us. Although in this case it's unlikely Cherab will drop Raysect (cherab/core#445 notwithstanding) it's still a good habit to get in to.

Copy link
Copy Markdown
Member

@vsnever vsnever Aug 28, 2024

Choose a reason for hiding this comment

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

Thanks for the explanation, I agree.

ext_modules=cythonize(extensions, force=force, compiler_directives=cython_directives),
)