diff --git a/dist/PhyPraKit-1.2.5-py2.py3-none-any.whl b/dist/PhyPraKit-1.2.5-py2.py3-none-any.whl deleted file mode 100644 index e90e1c9..0000000 Binary files a/dist/PhyPraKit-1.2.5-py2.py3-none-any.whl and /dev/null differ diff --git a/dist/PhyPraKit-1.2.5.tar.gz b/dist/PhyPraKit-1.2.5.tar.gz index 5e7bc4d..7cfe860 100644 Binary files a/dist/PhyPraKit-1.2.5.tar.gz and b/dist/PhyPraKit-1.2.5.tar.gz differ diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..4c08a73 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,62 @@ +[build-system] +requires = ["setuptools>=61.0"] +build-backend = "setuptools.build_meta" + +[tool.distutils.bdist_wheel] +universal = false + +[project] +name = "PhyPraKit" +dynamic = ["version"] +description = "Tools for data visualisation and analysis in Physics Lab Courses" +authors = [ + {name = "Guenter Quast", email = "Guenter.Quast@online.de"}, +] + +keywords = ["karlsruhe", "data", "analysis", "visualization", "lab", "laboratory", + "education", "university", "students", "physics"] + +requires-python = ">=3.6" +readme = "README.md" +license = {text = "MIT BSD 2-Clause License"} + +classifiers = [ + "License :: OSI Approved :: MIT BSD 2-Clause License", + "Development Status :: 5 - stable", + "Intended Audience :: Education", + "Intended Audience :: Science/Research", + "Topic :: Education", + "Topic :: Scientific/Engineering", + "Topic :: Scientific/Engineering :: Physics", + "Topic :: Scientific/Engineering :: Data Acquisition", + "Topic :: Scientific/Engineering :: Visualization", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11" ] + +dependencies = [ + "numpy", + "matplotlib", + "scipy", + "pandas", + "iminuit", + "kafe2", + "uncertainties" ] + +[project.scripts] +run_phyFit = 'PhyPraKit:run_phyFit.py' +plot_Data = 'PhyPraKit:plotData.py' +csv2yml = 'PhyPraKit:csv2yml.py' +plotCSV = 'PhyPraKit:plotCSV.py' +smoothCSV = 'PhyPraKit:smoothCSV.py' + +[tool.setuptools.packages.find] +include = ["PhyPraKit*"] + +[tool.setuptools.dynamic] +version = {attr = "PhyPraKit.__version__"} + diff --git a/setup.py b/setup.py index f23b070..a22af25 100644 --- a/setup.py +++ b/setup.py @@ -1,44 +1,3 @@ -import PhyPraKit # from this directory -import pathlib +# setup.py for compatibility with old setuptools from setuptools import setup - -# The directory containing this file -HERE = pathlib.Path(__file__).parent - -# The text of the README file -README = (HERE / "README.md").read_text() - - -setup( - name='PhyPraKit', - packages=['PhyPraKit'], - version=PhyPraKit.__version__, -# - author='Guenter Quast', - author_email='Guenter.Quast@online.de', - url='http://www.etp.kit.edu/~quast/', - license='GNU Public Licence', - description='Tools for data visualisation and analysis in Physics Lab Courses', - long_description=README, - scripts=['tools/run_phyFit.py', 'tools/plotData.py', - 'tools/csv2yml.py', 'tools/plotCSV.py' , 'tools/smoothCSV.py'], - classifiers=[ - 'Development Status :: 5 - Production/Stable', - # 'Development Status :: 4 - Beta', - # Specify the Python versions you support here. In particular, ensure - # that you indicate whether you support Python 2, Python 3 or both. - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - ], - install_requires=[\ - "NumPy >= 1.19", - "SciPy >= 1.5", - "matplotlib >= 3", - "iminuit >1.99", - "kafe2 >=2.6.0",] -) +setup() # reads from pyproject.toml diff --git a/setup.py.bak b/setup.py.bak new file mode 100644 index 0000000..f23b070 --- /dev/null +++ b/setup.py.bak @@ -0,0 +1,44 @@ +import PhyPraKit # from this directory +import pathlib +from setuptools import setup + +# The directory containing this file +HERE = pathlib.Path(__file__).parent + +# The text of the README file +README = (HERE / "README.md").read_text() + + +setup( + name='PhyPraKit', + packages=['PhyPraKit'], + version=PhyPraKit.__version__, +# + author='Guenter Quast', + author_email='Guenter.Quast@online.de', + url='http://www.etp.kit.edu/~quast/', + license='GNU Public Licence', + description='Tools for data visualisation and analysis in Physics Lab Courses', + long_description=README, + scripts=['tools/run_phyFit.py', 'tools/plotData.py', + 'tools/csv2yml.py', 'tools/plotCSV.py' , 'tools/smoothCSV.py'], + classifiers=[ + 'Development Status :: 5 - Production/Stable', + # 'Development Status :: 4 - Beta', + # Specify the Python versions you support here. In particular, ensure + # that you indicate whether you support Python 2, Python 3 or both. + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + ], + install_requires=[\ + "NumPy >= 1.19", + "SciPy >= 1.5", + "matplotlib >= 3", + "iminuit >1.99", + "kafe2 >=2.6.0",] +)