Skip to content

python:Change options for MDSplus setup.py to install all of package contents#2618

Closed
smithsp wants to merge 3 commits intoMDSplus:alphafrom
smithsp:python_setup
Closed

python:Change options for MDSplus setup.py to install all of package contents#2618
smithsp wants to merge 3 commits intoMDSplus:alphafrom
smithsp:python_setup

Conversation

@smithsp
Copy link

@smithsp smithsp commented Sep 7, 2023

I have implemented this change as a new setup.py file in the python directory, based off of the existing omas setup.py file. Ignore the changes to the existing setup.py file.

@mwinkel-dev mwinkel-dev self-assigned this Sep 7, 2023
@mwinkel-dev mwinkel-dev added US Priority branch/alpha This is present on or relates to the alpha branch labels Sep 7, 2023
%%
EOF_BEFORE
gcc -Iinclude -E -x c - << EOF_LIST |sed 's/#.*$//;/^$/d'
${CC:-gcc} -Iinclude -E -x c - << EOF_LIST |sed 's/#.*$//;/^$/d'
Copy link
Member

Choose a reason for hiding this comment

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

Thankfully, this will be improved in the switch to CMake


setup(
name='MDSplus',
version='7.139.40',
Copy link
Member

Choose a reason for hiding this comment

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

We'll need to pull the version either from a file or from the git tags

Copy link
Author

Choose a reason for hiding this comment

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

I am open to suggestions. Preferably this can be something dynamic, but filled in when a release is made.

Choose a reason for hiding this comment

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

Perhaps setuptools_scm?


def use_setuptools():
from setuptools import setup
from setuptools import setup, find_namespace_packages
Copy link
Member

Choose a reason for hiding this comment

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

We can probably just delete this file entirely

@smithsp
Copy link
Author

smithsp commented Sep 8, 2023

@WhoBrokeTheBuild Thanks for looking this over. I am open to closing this for now, and waiting for the new build system to be released. For the conda build, I am creating this setup.py file during the build, so there is no rush.

@dgarnier
Copy link
Contributor

FYI... most of this was fixed in #2698. There is a slight improvement in TdiHash.gen that is handled by the cmake branch, so I recommend closing this PR.

@smithsp
Copy link
Author

smithsp commented Feb 13, 2024

OK. I will close it for now, and will check back later when I have time to see how things are done in the other branches.

@smithsp smithsp closed this Feb 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/alpha This is present on or relates to the alpha branch US Priority

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants