Skip to content

migrate to pyproject.toml - #1876

Merged
casperdcl merged 5 commits into
masterfrom
pyproject
Aug 1, 2024
Merged

migrate to pyproject.toml#1876
casperdcl merged 5 commits into
masterfrom
pyproject

Conversation

@casperdcl

@casperdcl casperdcl commented Jul 22, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

Delete all the cruft! Oh and fix #1873.

misc

notes

incidentally you can already do pip install git+https://github.com/TomographicImaging/CIL@pyproject though for now it won't build libcilacc... will do that later in #1875

@casperdcl
casperdcl requested review from gfardell and paskino July 22, 2024 17:56
@casperdcl casperdcl self-assigned this Jul 22, 2024
casperdcl
casperdcl commented Jul 22, 2024
View reviewed changes
Comment thread pyproject.toml Outdated
@casperdcl casperdcl added bug Something isn't working enhancement New feature or request high_priority Waiting for review labels Jul 22, 2024
@casperdcl casperdcl changed the title migrate to pyproject.toml migrate to pyproject.toml Jul 22, 2024
@casperdcl

This comment was marked as resolved.

Sign in to view
@casperdcl
casperdcl force-pushed the pyproject branch 19 times, most recently from 3e39aa1 to 5e1ca4a Compare July 25, 2024 12:34
paskino
paskino reviewed Jul 25, 2024
View reviewed changes
Comment thread Wrappers/Python/CMakeLists.txt
Comment on lines 1 to 4
option (BUILD_PYTHON_WRAPPER "Build Python Wrapper" ON)

if (BUILD_PYTHON_WRAPPER)
find_package(PythonInterp REQUIRED)

@paskino paskino Jul 25, 2024

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.

Is this necessary?

@casperdcl casperdcl Jul 26, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Perhaps not, given that I can't find any usages of BUILD_PYTHON_WRAPPER(:BOOL)=OFF on GitHub.
Would probably remove it in a different PR though.

paskino
paskino approved these changes Jul 25, 2024
View reviewed changes

@paskino paskino 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.

Does conda set PKG_VERSION to the git tag?
https://docs.conda.io/projects/conda-build/en/latest/user-guide/environment-variables.html

@casperdcl

casperdcl commented Jul 26, 2024 •
edited
Loading

Copy link
Copy Markdown
Member Author

PKG_VERSION comes from recipe/meta.yaml::package.version :)

gfardell
gfardell reviewed Jul 31, 2024
View reviewed changes
Comment thread recipe/build.sh
extra_args=""
fi

export SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CIL="${PKG_VERSION}"

@gfardell gfardell Jul 31, 2024

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.

SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CIL

What is this for? and is PKG_VERSION set somewhere or is it a manual step? Currently it gets the version from git, I think historically CIL_VERSION had to be set - and maybe still is in some other repos.

@casperdcl
migrate to pyproject.toml
7978df4 
- fixes #1873
- add setuptools_scm
- drop setup.py
  + part of #1875
- drop Wrappers/Python/CMake
@casperdcl
update tests
2dfca2f
@casperdcl
fix conda version
01478a6 
- work-around for pypa/setuptools-scm#1059
@casperdcl
simplify install
2c41112
@casperdcl
add conda build requirement
4b02f49
@casperdcl
casperdcl merged commit 39a6ed0 into master Aug 1, 2024
@casperdcl
casperdcl deleted the pyproject branch August 1, 2024 15:31
This was referenced Jul 22, 2024
Open
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gfardell gfardell gfardell left review comments
@paskino paskino paskino approved these changes

Assignees

@casperdcl casperdcl

Labels

bug Something isn't working enhancement New feature or request high_priority Waiting for review

Projects

CIL work
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Fail to build on docker with setuptools >=71

3 participants

@casperdcl @paskino @gfardell