Skip to content

Move from setup.py to pyproject.toml#561

Merged
mferrera merged 1 commit intoequinor:mainfrom
mferrera:add-pyproject
Jun 30, 2023
Merged

Move from setup.py to pyproject.toml#561
mferrera merged 1 commit intoequinor:mainfrom
mferrera:add-pyproject

Conversation

@mferrera
Copy link
Copy Markdown
Collaborator

@mferrera mferrera commented Jun 22, 2023

Resolves #557

pyproject.toml is the home of the more modern and recommended build system and required to be uploaded to PyPI.

Some files were deleted as moved into there, and pre commit was deleted because I doubt we are using and it and CI catches it. But correct me if I'm wrong!

@mferrera mferrera requested a review from alifbe June 22, 2023 13:04
@berland
Copy link
Copy Markdown
Collaborator

berland commented Jun 23, 2023

The file ci/testkomodo.sh also requires a slight update in this PR.

@mferrera mferrera force-pushed the add-pyproject branch 2 times, most recently from 5ebfaed to bcf4614 Compare June 23, 2023 07:54
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jun 23, 2023

Codecov Report

Merging #561 (be70e73) into main (606e0b3) will decrease coverage by 1.46%.
The diff coverage is 64.31%.

❗ Current head be70e73 differs from pull request most recent head afc6897. Consider uploading reports for the commit afc6897 to get more accurate results

@@            Coverage Diff             @@
##             main     #561      +/-   ##
==========================================
- Coverage   86.10%   84.65%   -1.46%     
==========================================
  Files          48       52       +4     
  Lines        6996     7466     +470     
==========================================
+ Hits         6024     6320     +296     
- Misses        972     1146     +174     
Impacted Files Coverage Δ
src/subscript/co2_containment/co2_containment.py 44.06% <44.06%> (ø)
src/subscript/co2_containment/co2_calculation.py 67.10% <67.10%> (ø)
src/subscript/co2_containment/calculate.py 82.85% <82.85%> (ø)
src/subscript/eclcompress/allowlist.py 100.00% <100.00%> (ø)
src/subscript/eclcompress/eclcompress.py 94.76% <100.00%> (-0.77%) ⬇️

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

@mferrera mferrera requested a review from berland June 23, 2023 09:13
@berland
Copy link
Copy Markdown
Collaborator

berland commented Jun 23, 2023

I am unsure of the importance of MANIFEST.in, it does not look like its instructions are in the new pyproject.toml?

@mferrera
Copy link
Copy Markdown
Collaborator Author

mferrera commented Jun 23, 2023

From what I gathered MANIFEST.in is not necessary when setuptools_scm is being used. It helps to include files that may not be included in a distribution by default (i.e., not Python modules/packages) [1], but setuptools_scm supersedes this by building distributions from files that are tracked by git. [2] (third paragraph)

@mferrera mferrera force-pushed the add-pyproject branch 2 times, most recently from a7c562a to 882817b Compare June 30, 2023 06:38
Copy link
Copy Markdown
Collaborator

@alifbe alifbe left a comment

Choose a reason for hiding this comment

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

👍

@mferrera mferrera merged commit b7bf2fa into equinor:main Jun 30, 2023
@mferrera mferrera deleted the add-pyproject branch June 30, 2023 08:34
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.

Add pyproject.toml and rework top-level dot/config files

4 participants