gmshairfoil2d 0.2__tar.gz → 0.2.1__tar.gz

{gmshairfoil2d-0.2 → gmshairfoil2d-0.2.1}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: gmshairfoil2d
-Version: 0.2
+Version: 0.2.1
 Summary: Python tool to generate 2D mesh around an airfoil
 Home-page: https://github.com/cfsengineering/GMSH-Airfoil-2D
 Author: Giacomo Benedetti
 Author-email: giacomo.benedetti@cfse.ch
-License: Apache License 2.0
 Keywords: airfoil,2D,mesh,cfd,gmsh
 Classifier: Programming Language :: Python :: 3.11
 Classifier: License :: OSI Approved :: Apache Software License
@@ -25,7 +24,6 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
-Dynamic: license
 Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python

{gmshairfoil2d-0.2 → gmshairfoil2d-0.2.1}/gmshairfoil2d/airfoil_func.py

@@ -2,6 +2,7 @@ from pathlib import Path
 
 import numpy as np
 import requests
+import sys
 
 import gmshairfoil2d.__init__
 
@@ -49,8 +50,17 @@ def get_airfoil_file(airfoil_name):
 
     r = requests.get(url)
 
-    if r.status_code != 200:
-        raise Exception(f"Could not get airfoil {airfoil_name}")
+    try:
+        r = requests.get(url, timeout=10) # Aggiungi sempre un timeout
+        if r.status_code != 200:
+             # Invece di raise Exception, print e exit pulito
+             print(f"❌ Error: Could not find airfoil '{airfoil_name}' on UIUC database.")
+             import sys
+             sys.exit(1)
+    except requests.exceptions.RequestException as e:
+        print(f"❌ Network Error: Could not connect to the database. Check your internet.")
+        import sys
+        sys.exit(1)
 
     file_path = Path(database_dir, f"{airfoil_name}.dat")
 

{gmshairfoil2d-0.2 → gmshairfoil2d-0.2.1}/gmshairfoil2d.egg-info/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: gmshairfoil2d
-Version: 0.2
+Version: 0.2.1
 Summary: Python tool to generate 2D mesh around an airfoil
 Home-page: https://github.com/cfsengineering/GMSH-Airfoil-2D
 Author: Giacomo Benedetti
 Author-email: giacomo.benedetti@cfse.ch
-License: Apache License 2.0
 Keywords: airfoil,2D,mesh,cfd,gmsh
 Classifier: Programming Language :: Python :: 3.11
 Classifier: License :: OSI Approved :: Apache Software License
@@ -25,7 +24,6 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
-Dynamic: license
 Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python

{gmshairfoil2d-0.2 → gmshairfoil2d-0.2.1}/gmshairfoil2d.egg-info/SOURCES.txt

@@ -1,10 +1,6 @@
 LICENSE
 README.md
 setup.py
-./gmshairfoil2d/__init__.py
-./gmshairfoil2d/airfoil_func.py
-./gmshairfoil2d/geometry_def.py
-./gmshairfoil2d/gmshairfoil2d.py
 gmshairfoil2d/__init__.py
 gmshairfoil2d/airfoil_func.py
 gmshairfoil2d/geometry_def.py
@@ -15,5 +11,6 @@ gmshairfoil2d.egg-info/dependency_links.txt
 gmshairfoil2d.egg-info/entry_points.txt
 gmshairfoil2d.egg-info/requires.txt
 gmshairfoil2d.egg-info/top_level.txt
+tests/__init__.py
 tests/test_airfoil_func.py
 tests/test_geometry_def.py

{gmshairfoil2d-0.2 → gmshairfoil2d-0.2.1}/gmshairfoil2d.egg-info/top_level.txt

@@ -1 +1,2 @@
 gmshairfoil2d
+tests

{gmshairfoil2d-0.2 → gmshairfoil2d-0.2.1}/setup.py

@@ -1,8 +1,8 @@
 from pathlib import Path
-import setuptools
+from setuptools import setup, find_packages
 
 NAME = "gmshairfoil2d"
-VERSION = "0.2"
+VERSION = "0.2.1"
 AUTHOR = "Giacomo Benedetti"
 EMAIL = "giacomo.benedetti@cfse.ch"
 DESCRIPTION = "Python tool to generate 2D mesh around an airfoil"
@@ -22,7 +22,7 @@ README = "README.md"
 PACKAGE_DIR = "."
 LICENSE = "Apache License 2.0"
 
-setuptools.setup(
+setup(
     name=NAME,
     version=VERSION,
     author=AUTHOR,
@@ -32,16 +32,20 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     url=URL,
     include_package_data=True,
-    package_dir={"": PACKAGE_DIR},
-    license=LICENSE,
-    packages=[NAME],
+
+    packages=find_packages(), 
     python_requires=REQUIRES_PYTHON,
     entry_points = {
         "console_scripts": ['gmshairfoil2d = gmshairfoil2d.gmshairfoil2d:main']
         },
     keywords=["airfoil", "2D", "mesh", "cfd", "gmsh"],
-    install_requires=REQUIRED,
-    # See: https://pypi.org/classifiers/
+
+    install_requires=[
+        "gmsh>=4.14",
+        "numpy>=1.20.3",
+        "pytest==7.1.3",
+        "requests==2.26.0",
+    ],
     classifiers=[
         "Programming Language :: Python :: 3.11",
         "License :: OSI Approved :: Apache Software License",

gmshairfoil2d-0.2.1/tests/test_airfoil_func.py

@@ -0,0 +1,77 @@
+import pickle
+from pathlib import Path
+from unittest.mock import patch, Mock
+
+import gmshairfoil2d.__init__
+from gmshairfoil2d.airfoil_func import (NACA_4_digit_geom, get_airfoil_file,
+                                        get_all_available_airfoil_names)
+from pytest import approx
+
+LIB_DIR = Path(gmshairfoil2d.__init__.__file__).parents[1]
+
+database_dir = Path(LIB_DIR, "database")
+test_data_dir = Path(LIB_DIR, "tests", "test_data")
+
+def test_get_all_available_airfoil_names(monkeypatch):
+    class MockResponse:
+        def __init__(self):
+            self.status_code = 200
+            self.text = (
+                '<html>'
+                '<a href="coord/naca0010.dat">naca0010</a>'
+                '<a href="coord/naca0018.dat">naca0018</a>'
+                '<a href="coord/falcon.dat">falcon</a>'
+                '<a href="coord/goe510.dat">goe510</a>'
+                '<a href="coord/e1210.dat">e1210</a>'
+                '</html>'
+            )
+
+    monkeypatch.setattr("gmshairfoil2d.airfoil_func.requests.get", lambda *args, **kwargs: MockResponse())
+
+    current_airfoil_list = get_all_available_airfoil_names()
+
+    expected_airfoil = ["naca0010", "naca0018", "falcon", "goe510", "e1210"]
+    for foil in expected_airfoil:
+        assert foil in current_airfoil_list
+
+
+def test_get_airfoil_file(monkeypatch, tmp_path):
+
+    fake_text = "0.0 0.0\n0.5 0.1\n1.0 0.0"
+
+    class MockResponse:
+        def __init__(self):
+            self.status_code = 200
+            self.text = fake_text
+            self.content = fake_text.encode('utf-8')
+
+    monkeypatch.setattr("gmshairfoil2d.airfoil_func.requests.get", lambda *args, **kwargs: MockResponse())
+
+    monkeypatch.setattr("gmshairfoil2d.airfoil_func.database_dir", tmp_path)
+
+    profile = "naca0010"
+    expected_path = tmp_path / f"{profile}.dat"
+
+    get_airfoil_file(profile)
+
+    assert expected_path.exists()
+    assert expected_path.read_text() == fake_text
+
+
+def test_NACA_4_digit_geom():
+    with open(Path(test_data_dir, "naca0012.txt"), "rb") as f:
+        naca0012 = pickle.load(f)
+    with open(Path(test_data_dir, "naca4412.txt"), "rb") as f:
+        naca4412 = pickle.load(f)
+
+    """
+    Test if the NACA0012 profil and NACA4412 profil are correctly generated
+    """
+
+    assert all(
+        [a == approx(b, 1e-3) for a, b in zip(naca0012, NACA_4_digit_geom("0012"))]
+    )
+
+    assert all(
+        [a == approx(b, 1e-3) for a, b in zip(naca4412, NACA_4_digit_geom("4412"))]
+    )

gmshairfoil2d-0.2/tests/test_airfoil_func.py

@@ -1,73 +0,0 @@
-import pickle
-from pathlib import Path
-
-import gmshairfoil2d.__init__
-from gmshairfoil2d.airfoil_func import (NACA_4_digit_geom, get_airfoil_file,
-                                        get_all_available_airfoil_names)
-from pytest import approx
-
-LIB_DIR = Path(gmshairfoil2d.__init__.__file__).parents[1]
-
-database_dir = Path(LIB_DIR, "database")
-test_data_dir = Path(LIB_DIR, "tests", "test_data")
-
-def test_get_all_available_airfoil_names():
-    """
-    Test if at least the database obtained containt some airfoils
-
-    """
-
-    expected_airfoil = ["naca0010", "naca0018", "falcon", "goe510", "e1210"]
-    current_airfoil_list = get_all_available_airfoil_names()
-
-    for foil in expected_airfoil:
-        assert foil in current_airfoil_list
-
-
-def test_get_airfoil_file():
-    """
-    Test if the download of some profiles is possible and if it is, check if
-    they are conform.
-    """
-
-    # Remove airfoil if they exist
-    for profile in ["naca0010", "naca4412"]:
-        
-        proflie_dl_path = Path(database_dir, profile + ".dat")
-        if proflie_dl_path.exists():
-            proflie_dl_path.unlink()
-
-        # Download them back
-        get_airfoil_file(profile)
-
-        # Test if download is correctly done
-        assert proflie_dl_path.exists()
-
-        with open(proflie_dl_path, "r") as f:
-            profil_dl = f.read()
-
-        proflie_test_path = Path(test_data_dir, profile + ".dat")
-        with open(proflie_test_path, "r") as f:
-            profil_test = f.read()
-        
-        # Test if the downloaded profile is the same as the test profile
-        assert profil_test == profil_dl
-
-
-def test_NACA_4_digit_geom():
-    """
-    Test if the NACA0012 profil and NACA4412 profil are correctly generated
-    
-    """
-    
-    with open(Path(test_data_dir, "naca0012.txt"), "rb") as f:
-        naca0012 = pickle.load(f)
-    with open(Path(test_data_dir, "naca4412.txt"), "rb") as f:
-        naca4412 = pickle.load(f)
-
-    assert all(
-        [a == approx(b, 1e-3) for a, b in zip(naca0012, NACA_4_digit_geom("0012"))]
-    )
-    assert all(
-        [a == approx(b, 1e-3) for a, b in zip(naca4412, NACA_4_digit_geom("4412"))]
-    )