diff --git a/bin/wfbench b/bin/wfbench index afedb8a..f96d86c 100755 --- a/bin/wfbench +++ b/bin/wfbench @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # -*- coding: utf-8 -*- # # Copyright (c) 2021-2024 The WfCommons Team. diff --git a/pyproject.toml b/pyproject.toml index dabe3f4..52089f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "wfcommons" authors = [{name = "WfCommons team", email = "support@wfcommons.org"}] description = "A Framework for Enabling Scientific Workflow Research and Education" readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" classifiers = [ "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Operating System :: OS Independent", @@ -29,6 +29,7 @@ dependencies = [ "matplotlib", "networkx", "numpy", + "pandas", "python-dateutil", "requests", "scipy", diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 2913b44..0000000 --- a/requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -jsonschema~=3.2.0 -matplotlib>=3.3.0 -networkx>=3.0 -numpy>=1.19.1 -python-dateutil>=2.8.1 -requests>=2.24.0 -scipy>=1.5.2 -setuptools>=49.3.1 -pyyaml>=5.3.1 -pandas>=1.2.4 -stringcase>=1.2.0 -filelock>=3.6.0 \ No newline at end of file diff --git a/setup.py b/setup.py index 292f21e..3576856 100644 --- a/setup.py +++ b/setup.py @@ -24,58 +24,13 @@ def run(self): sys.exit(-1) super().run() - -with open('README.md', 'r') as fh: - long_description = fh.read() - -# Fetch the version -exec(open('wfcommons/version.py').read()) - setup( - name='wfcommons', - version="1.1", - license='LGPLv3', - author='WfCommons team', - author_email='support@wfcommons.org', - description='A Framework for Enabling Scientific Workflow Research and Education', - long_description=long_description, - long_description_content_type='text/markdown', - url='https://github.com/wfcommons/wfcommons', packages=find_packages(), include_package_data=True, has_ext_modules=lambda: True, cmdclass={ 'build_ext': Build, }, - install_requires=[ - 'jsonschema', - 'matplotlib', - 'networkx', - 'numpy', - 'python-dateutil', - 'requests', - 'scipy', - 'setuptools', - 'pyyaml', - 'pandas', - 'stringcase' - ], - classifiers=[ - 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12', - 'Intended Audience :: Developers', - 'Intended Audience :: Education', - 'Intended Audience :: Science/Research', - 'Natural Language :: English', - 'Topic :: Documentation :: Sphinx', - 'Topic :: System :: Distributed Computing' - ], - python_requires='>=3.9', data_files=[ ('bin', ['bin/cpu-benchmark', 'bin/wfbench']) ],