From 9a19dcdcd1e5972ba5877ac3b4becbf7b6406ebb Mon Sep 17 00:00:00 2001 From: Pierre Bonneel Date: Tue, 3 May 2022 21:42:45 +0200 Subject: [PATCH] [VI] Updating versions before release --- pyleecan/__init__.py | 2 +- requirements-full.txt | 27 +++++++++++++++++++++++++++ requirements.txt | 11 +---------- setup.py | 43 ++++++++++++++++++++++++------------------- 4 files changed, 53 insertions(+), 30 deletions(-) create mode 100644 requirements-full.txt diff --git a/pyleecan/__init__.py b/pyleecan/__init__.py index efd67ddeb..1285e1091 100644 --- a/pyleecan/__init__.py +++ b/pyleecan/__init__.py @@ -11,6 +11,6 @@ else: USER_DIR = os.environ["HOME"] + "/.local/share/" + PACKAGE_NAME -__version__ = "1.3.8" +__version__ = "1.3.9" init_default_log() diff --git a/requirements-full.txt b/requirements-full.txt new file mode 100644 index 000000000..a8ca60071 --- /dev/null +++ b/requirements-full.txt @@ -0,0 +1,27 @@ +cloudpickle>=1.3.0 +ezdxf==0.14.2 +h5py>=3.2.1 +matplotlib>=3.3.2 +meshio>=4.0.15 +numpy>1.19.5 +pandas>=1.0.3 +pyfemm>=0.1.1;platform_system=="Windows" +PySide2>=5.15.2 +pyuff>=1.25 +pyvista>=0.25.3 +quadpy +SciDataTool>=2.3.11 +scipy>=1.4.1 +setuptools +swat_em>=0.6.3 +xlrd>=1.2.0 +xlwt>=1.3.0 +ddt>=1.3.1 +deap>=1.3.1 +hypothesis +mock>=4.0.2 +nbconvert +nbformat +pytest>=5.4.1 +pytest-qt>=3.3.0 +smoot>=0.1.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 4296ce4fc..2571141b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,27 +1,18 @@ cloudpickle>=1.3.0 -ddt>=1.3.1 -deap>=1.3.1 ezdxf==0.14.2 h5py>=3.2.1 matplotlib>=3.3.2 meshio>=4.0.15 -mock>=4.0.2 -nbconvert -nbformat numpy>1.19.5 pandas>=1.0.3 pyfemm>=0.1.1;platform_system=="Windows" PySide2>=5.15.2 -pytest>=5.4.1 -pytest-qt>=3.3.0 pyuff>=1.25 pyvista>=0.25.3 quadpy -SciDataTool>=2.0.6 +SciDataTool>=2.3.11 scipy>=1.4.1 setuptools swat_em>=0.6.3 xlrd>=1.2.0 xlwt>=1.3.0 -hypothesis -smoot \ No newline at end of file diff --git a/setup.py b/setup.py index 1445d138c..2051bb0fc 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ # Release 1.1.0 : 1.1.0 # First post release of the release 1.1.0 : 1.1.0.post1 -PYLEECAN_VERSION = "1.3.8" +PYLEECAN_VERSION = "1.3.9" with open("README.md", "r") as fh: @@ -29,39 +29,43 @@ python_requires = ">= 3.6" -# Pyleecan dependancies +# Pyleecan main dependancies install_requires = [ - "setuptools", "cloudpickle>=1.3.0", + "ezdxf==0.14.2", + "h5py>=3.2.1", "matplotlib>=3.3.2", + "meshio>=4.0.15", "numpy>1.19.5", "pandas>=1.0.3", 'pyfemm>=0.1.1;platform_system=="Windows"', "PySide2>=5.15.2", - "swat_em>=0.6.3", + "pyuff>=1.25", + "pyvista>=0.25.3", + "quadpy", + "SciDataTool>=2.3.11", "scipy>=1.4.1", + "setuptools", + "swat_em>=0.6.3", "xlrd>=1.2.0", "xlwt>=1.3.0", - "deap>=1.3.1", - "SciDataTool>=2.0.6", - "pyvista>=0.25.3", - "meshio>=4.0.15", - "h5py>=3.2.1", - "nbformat", - "nbconvert", - "quadpy", - "ezdxf>=0.14.2", - "pytest-qt>=3.3.0", - "pyuff>=1.25", +] +# Pyleecan optional dependancies +full_require = [ + 'deap>=1.3.1', + 'smoot>=0.1.0', + 'gmsh-sdk>=4.6.0', ] +# Pyleecan Test dependancies tests_require = [ "ddt>=1.3.1", - "pytest>=5.4.1", - "pytest-qt>=3.3.0", + "hypothesis", "mock>=4.0.2", - "nbformat", "nbconvert", + "nbformat", + "pytest>=5.4.1", + "pytest-qt>=3.3.0", ] setuptools.setup( @@ -91,6 +95,7 @@ python_requires=python_requires, install_requires=install_requires, extras_require={ - "test": tests_require + "test": tests_require, + "full": full_require }, # Enables to install the test dependancies using pip install pyleecan[test] )