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

Move setuptools-scm configuration to pyproject.toml #885

Merged
merged 1 commit into from
Sep 21, 2023

Conversation

mferrera
Copy link
Contributor

@mferrera mferrera commented Sep 21, 2023

setuptools-scm 8.0.1 seems to have issues with the version file being provided through the old setup.py function.

@mferrera mferrera force-pushed the setuptools-fix branch 2 times, most recently from 635a3c6 to 6ae7586 Compare September 21, 2023 07:50
setuptools-scm > 8.0.0 seems to take issue with version file paths
supplied in setup.py. This is a step toward a more pyproject.toml
oriented package structure as well.
@mferrera mferrera changed the title Use setuptools_scm version_file over write_to Move setuptools-scm configuration to pyproject.toml Sep 21, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #885 (1a2732a) into main (151e193) will increase coverage by 0.03%.
Report is 6 commits behind head on main.
The diff coverage is 85.35%.

@@            Coverage Diff             @@
##             main     #885      +/-   ##
==========================================
+ Coverage   80.78%   80.82%   +0.03%     
==========================================
  Files          87       87              
  Lines       12887    13038     +151     
  Branches     2113     2142      +29     
==========================================
+ Hits        10411    10538     +127     
- Misses       1785     1805      +20     
- Partials      691      695       +4     
Files Changed Coverage Δ
src/xtgeo/surface/regular_surface.py 82.33% <33.33%> (-0.20%) ⬇️
src/xtgeo/well/blocked_well.py 48.00% <40.00%> (+0.08%) ⬆️
src/xtgeo/surface/_regsurf_oper.py 79.65% <82.35%> (+2.15%) ⬆️
src/xtgeo/xyz/_xyz_oper.py 78.59% <85.71%> (+1.60%) ⬆️
src/xtgeo/xyz/_xyz.py 85.80% <95.91%> (+2.20%) ⬆️

... and 4 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Collaborator

@jcrivenaes jcrivenaes left a comment

Choose a reason for hiding this comment

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

LGTM

@mferrera mferrera merged commit a096599 into equinor:main Sep 21, 2023
24 of 25 checks passed
@mferrera mferrera deleted the setuptools-fix branch September 21, 2023 09:03
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.

3 participants