diff --git a/dev_requirements.txt b/dev_requirements.txt index 571db01..bf753a2 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,8 +1,7 @@ cffi>=1.15.0 psutil>=5.8.0 numpy>=1.19.5 -pandas>=1.1.5; platform.python_implementation == 'CPython' -pandas<=1.2.5; platform.python_implementation == 'PyPy' +pandas>=1.1.5 dpkt>=1.9.7 wheel>=0.37.0 twine>=3.4.2 diff --git a/requirements.txt b/requirements.txt index 5777cfc..00de92b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ cffi>=1.15.0 psutil>=5.8.0 numpy>=1.19.5 -pandas>=1.1.5; platform.python_implementation == 'CPython' -pandas<=1.2.5; platform.python_implementation == 'PyPy' +pandas>=1.1.5 dpkt>=1.9.7 \ No newline at end of file diff --git a/setup.py b/setup.py index 00d9f00..08656ac 100644 --- a/setup.py +++ b/setup.py @@ -21,20 +21,13 @@ import os THIS_DIRECTORY = str(pathlib.Path(__file__).parent.resolve()) -if (not sys.version_info[0] == 3) and (not sys.version_info[1] >= 6): - sys.exit("Sorry, nfstream requires Python3.6+ versions.") +if (not sys.version_info[0] == 3) and (not sys.version_info[1] >= 9): + sys.exit("Sorry, nfstream requires Python3.9+ versions.") with open(os.path.join(THIS_DIRECTORY, "README.md"), encoding="utf-8") as f: LONG_DESCRIPTION = f.read() -INSTALL_REQUIRES = ["cffi>=1.15.0", "psutil>=5.8.0", "dpkt>=1.9.7", "numpy>=1.19.5"] - -if ( - platform.python_implementation() == "PyPy" -): # This is mandatory to fix pandas issues with PyPy - INSTALL_REQUIRES.append("pandas<=1.2.5") -else: - INSTALL_REQUIRES.append("pandas>=1.1.5") +INSTALL_REQUIRES = ["cffi>=1.15.0", "psutil>=5.8.0", "dpkt>=1.9.7", "numpy>=1.19.5", "pandas>=1.1.5"] setup(