diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index a0dbd84..be6da09 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/epyt/__init__.py b/epyt/__init__.py index a6be376..85cf68c 100644 --- a/epyt/__init__.py +++ b/epyt/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- __author__ = """Marios S. Kyriakou""" __email__ = "kiriakou.marios@ucy.ac.cy" -__version__ = "1.0.9-beta.2" +__version__ = "1.0.9-beta.3" __copyright__ = """Copyright 2022, KIOS Research and Innovation Center of Excellence (KIOS CoE), University of Cyprus (www.kios.org.cy).""" __license__ = "EUPL License, Version 1.2" diff --git a/epyt/epanet.py b/epyt/epanet.py index f066d22..333cbd9 100644 --- a/epyt/epanet.py +++ b/epyt/epanet.py @@ -12807,12 +12807,7 @@ def __init__(self, version=2.2, msx=False): libname = f"epanet" ops = platform.system().lower() if ops in ["windows"]: - if "32" in str(platform.architecture()): - self.LibEPANET = resource_filename("epyt", os.path.join("libraries", "win", '32bit', - f"{libname}2.dll")) - elif "64" in str(platform.architecture()): - self.LibEPANET = resource_filename("epyt", os.path.join("libraries", "win", '64bit', - f"{libname}2.dll")) + self.LibEPANET = resource_filename("epyt", os.path.join("libraries", "win", '64bit', f"{libname}2.dll")) elif ops in ["darwin"]: self.LibEPANET = resource_filename("epyt", os.path.join("libraries", f"mac/lib{libname}.dylib")) else: diff --git a/epyt/libraries/win/32bit/epanet2.dll b/epyt/libraries/win/32bit/epanet2.dll deleted file mode 100644 index 1828580..0000000 Binary files a/epyt/libraries/win/32bit/epanet2.dll and /dev/null differ diff --git a/epyt/libraries/win/32bit/epanet2.exe b/epyt/libraries/win/32bit/epanet2.exe deleted file mode 100644 index c48b134..0000000 Binary files a/epyt/libraries/win/32bit/epanet2.exe and /dev/null differ diff --git a/epyt/libraries/win/64bit/epanet2.dll b/epyt/libraries/win/epanet2.dll similarity index 100% rename from epyt/libraries/win/64bit/epanet2.dll rename to epyt/libraries/win/epanet2.dll diff --git a/epyt/libraries/win/64bit/epanet2.exe b/epyt/libraries/win/epanet2.exe similarity index 100% rename from epyt/libraries/win/64bit/epanet2.exe rename to epyt/libraries/win/epanet2.exe diff --git a/epyt/libraries/win/64bit/epanetmsx.dll b/epyt/libraries/win/epanetmsx.dll similarity index 100% rename from epyt/libraries/win/64bit/epanetmsx.dll rename to epyt/libraries/win/epanetmsx.dll diff --git a/epyt/libraries/win/64bit/epanetmsx.exe b/epyt/libraries/win/epanetmsx.exe similarity index 100% rename from epyt/libraries/win/64bit/epanetmsx.exe rename to epyt/libraries/win/epanetmsx.exe