Skip to content

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

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

Closed
smithsp wants to merge 3 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88abee3
python:Change options for MDSplus setup.py to install all of package …
smithsp Sep 7, 2023
e9f5c0d
Use CC environment variable, if existing
smithsp Sep 7, 2023
2b4044c
Update python/setup.py
smithsp Sep 8, 2023
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
3 changes: 2 additions & 1 deletion python/MDSplus/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,12 @@ def run(self):


def use_setuptools():
from setuptools import setup
from setuptools import setup, find_namespace_packages

@WhoBrokeTheBuild WhoBrokeTheBuild Sep 8, 2023

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.

We can probably just delete this file entirely

setup(
include_package_data=True,
test_suite='tests.test_all',
zip_safe=False,
packages=find_namespace_packages(where='.'),
**setupkw()
)

Expand Down
18 changes: 18 additions & 0 deletions python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
from setuptools import setup

setup(
name='MDSplus',
version='7.139.40',

@WhoBrokeTheBuild WhoBrokeTheBuild Sep 8, 2023

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.

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

@smithsp smithsp Sep 8, 2023

Copy link
Copy Markdown
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.

@namurphy namurphy Sep 29, 2023

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Perhaps setuptools_scm?

description='MDSplus Python Objects',
url='https://gafusion.github.io/omas',
Comment thread
smithsp marked this conversation as resolved.
Outdated
author='MDSplus Developers',
license='MIT',
classifiers=['License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 3'],
keywords=['physics', 'mdsplus', ],
long_description=(
"This module provides all of the functionality of MDSplus TDI natively in python.\n"
"All of the MDSplus data types such as signal are represented as python classes.\n"
),
packages=['MDSplus'],
package_data={'MDSplus':['*.py']},
)
2 changes: 1 addition & 1 deletion tdishr/yylex/TdiHash.gen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cat << EOF_BEFORE
struct fun { int name; int idx; };
%%
EOF_BEFORE
gcc -Iinclude -E -x c - << EOF_LIST |sed 's/#.*$//;/^$/d'
${CC:-gcc} -Iinclude -E -x c - << EOF_LIST |sed 's/#.*$//;/^$/d'

@WhoBrokeTheBuild WhoBrokeTheBuild Sep 8, 2023

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.

Thankfully, this will be improved in the switch to CMake

#define COM
#define OPC(name, cmd,...) cmd,__LINE__-25
#include <opcbuiltins.h>
Expand Down