From 68d06338485f46c4a67409d97202778693c3e37b Mon Sep 17 00:00:00 2001 From: DocMT <70267658+DocMT@users.noreply.github.com> Date: Fri, 27 Jun 2025 21:48:01 +0200 Subject: [PATCH 01/27] Update viphreeqc.py Added 'emscripten' as possible platform, which is needed to run in pyodide environments in the webbrowser --- phreeqpython/viphreeqc.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phreeqpython/viphreeqc.py b/phreeqpython/viphreeqc.py index ac913ac..c9cb039 100644 --- a/phreeqpython/viphreeqc.py +++ b/phreeqpython/viphreeqc.py @@ -44,6 +44,8 @@ def __init__(self, dll_path=None): dll_name = './lib/viphreeqc.so' elif sys.platform == 'darwin': dll_name = './lib/viphreeqc.dylib' + elif 'emscripten' in sys.platform: + dll_name = './lib/viphreeqc.so' else: msg = 'Platform %s is not supported.' % sys.platform raise NotImplementedError(msg) From a135989c29f3317d09209fbf27ef327162c1b1af Mon Sep 17 00:00:00 2001 From: DocMT <70267658+DocMT@users.noreply.github.com> Date: Fri, 27 Jun 2025 22:20:20 +0200 Subject: [PATCH 02/27] Update appveyor.yml --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 5b984c1..bfe5b7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,6 +9,8 @@ init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" install: + - "%PYTHON%/python.exe -m pip install pytest" + - "%PYTHON%/python.exe -m pip install numpy" - "%PYTHON%/python.exe -m pip install scipy" - "%PYTHON%/python.exe -m pip install periodictable" - "%PYTHON%/python.exe -m pip install nose" From 1f8bd4cdcd06414ea781967de5cfbaebda3389e7 Mon Sep 17 00:00:00 2001 From: DocMT <70267658+DocMT@users.noreply.github.com> Date: Fri, 27 Jun 2025 22:33:16 +0200 Subject: [PATCH 03/27] Update viphreeqc.py rename library for pyodide environment --- phreeqpython/viphreeqc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phreeqpython/viphreeqc.py b/phreeqpython/viphreeqc.py index c9cb039..2cf8a30 100644 --- a/phreeqpython/viphreeqc.py +++ b/phreeqpython/viphreeqc.py @@ -45,7 +45,7 @@ def __init__(self, dll_path=None): elif sys.platform == 'darwin': dll_name = './lib/viphreeqc.dylib' elif 'emscripten' in sys.platform: - dll_name = './lib/viphreeqc.so' + dll_name = './lib/viphreeqcwasm.so' else: msg = 'Platform %s is not supported.' % sys.platform raise NotImplementedError(msg) From 5039c5e1403a88edeeb735f4d402d0f2e1854c26 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 11:18:18 +0200 Subject: [PATCH 04/27] Create python-package.yml --- .github/workflows/python-package.yml | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/python-package.yml diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml new file mode 100644 index 0000000..00a56bf --- /dev/null +++ b/.github/workflows/python-package.yml @@ -0,0 +1,42 @@ +# This workflow will install Python dependencies, run tests and lint with a variety of Python versions +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python + +name: Python package + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.9", "3.10", "3.11"] + + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install flake8 pytest + python -m pip install numpy scipy periodictable + python setup.py install + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Lint with flake8 + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest + run: | + pytest From 6c7f26b60c9fa374bfac969a901ee44a8fd92bfb Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 11:27:04 +0200 Subject: [PATCH 05/27] Update viphreeqc.py to pass flake8 analysis --- phreeqpython/viphreeqc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phreeqpython/viphreeqc.py b/phreeqpython/viphreeqc.py index 2cf8a30..6ae5499 100644 --- a/phreeqpython/viphreeqc.py +++ b/phreeqpython/viphreeqc.py @@ -15,7 +15,7 @@ def bytes(str_, encoding): #pylint: disable-msg=W0613 """Compatibilty function for Python 3. """ return str_ - range = xrange #pylint: disable-msg=C0103 + range = xrange #pylint: disable-msg=C0103 # noqa: F821 #pylint: enable-msg=W0622 From 5b5a3058185c146e8eea5d769c1d24b80162585d Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 12:50:53 +0200 Subject: [PATCH 06/27] Update test_phreeqpython.py The molar mass of Mg must have changed in the new "periodictable" module, which lead to some errors --- tests/test_phreeqpython.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_phreeqpython.py b/tests/test_phreeqpython.py index ae116c7..ddf864c 100644 --- a/tests/test_phreeqpython.py +++ b/tests/test_phreeqpython.py @@ -1,4 +1,4 @@ -from phreeqpython import PhreeqPython, Solution +from phreeqpython import PhreeqPython, Solution, utility from pathlib import Path import pytest @@ -39,7 +39,7 @@ def test01_basiscs(self): assert round(sol.species_activities['Ca+2'], 5) == 0.00054 # test add_solution_simple as milligrams - sol2 = self.pp.add_solution_simple({'Ca': 40.078, 'Na': 22.99, 'MgSO4': 120.37}, units='mg') + sol2 = self.pp.add_solution_simple({'Ca': 40.078, 'Na': 22.99, 'MgSO4': utility.convert_units('MgSO4', 1, 'mmol', 'mg')}, units='mg') # test conversion from mg to mmol assert round(sol2.total("Ca", 'mmol'), 4) == 1 # test amount in mg @@ -57,7 +57,7 @@ def test02_solution_functions(self): assert round(sol.total('Cl'), 2) == 3.5 assert round(sol.total('Mg'), 2) == 1 # change solution in mgs (add and subtract) - sol.change({'Na': 11.495, 'MgCl2': -95.211}, 'mg') + sol.change({'Na': 11.495, 'MgCl2': -utility.convert_units('MgCl2', 1, 'mmol', 'mg')}, 'mg') assert round(sol.total('Cl'), 2) == 1.5 assert round(sol.total('Mg'), 2) == 0 From 0bd5ca1ab75daf9c9fb7931753564bcb7b811f3e Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 12:53:50 +0200 Subject: [PATCH 07/27] Update test_utility.py --- tests/test_utility.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_utility.py b/tests/test_utility.py index 75008ee..5f31db0 100644 --- a/tests/test_utility.py +++ b/tests/test_utility.py @@ -12,7 +12,7 @@ def test_convert_units(self): ) == 39997.0 assert round( convert_units('NaOH', 1, from_units='mol', to_units='ug'), 0 - ) == 39997110.0 + ) == 39996769.0 assert round( convert_units('NaOH', 1, from_units='mmol', to_units='mol'), 4 From abcbdcbfc5e51368437726cf26f55bdde0ebc058 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 13:30:40 +0200 Subject: [PATCH 08/27] Update setup.py --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 80fbe6b..50568d7 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,7 @@ license='Apache Licence 2.0', packages=['phreeqpython'], include_package_data=True, + package_data={'phreeqpython': ['phreeqpython/lib/*.so','phreeqpython/lib/*.dll','phreeqpython/lib/*.dylib', 'phreeqpython/database/*.dat'] }, zip_safe=False, - install_requires=['periodictable'] + install_requires=['periodictable','numpy','scipy'] ) From ca97720f526afd3312146d7e40e28a3cf20c4f20 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 13:41:35 +0200 Subject: [PATCH 09/27] Update setup.py --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 50568d7..eea6d6a 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup +from setuptools import setup, find_packages import os import sys import zipfile @@ -11,9 +11,8 @@ author='Abel Heinsbroek', author_email='abel.heinsbroek@vitens.nl', license='Apache Licence 2.0', - packages=['phreeqpython'], + packages=find_packages(), include_package_data=True, - package_data={'phreeqpython': ['phreeqpython/lib/*.so','phreeqpython/lib/*.dll','phreeqpython/lib/*.dylib', 'phreeqpython/database/*.dat'] }, zip_safe=False, install_requires=['periodictable','numpy','scipy'] ) From aa2f30ad09b2fa449e99fd9c58477ced91cadb57 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 13:48:37 +0200 Subject: [PATCH 10/27] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index eea6d6a..6f15bdb 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ author='Abel Heinsbroek', author_email='abel.heinsbroek@vitens.nl', license='Apache Licence 2.0', - packages=find_packages(), + packages=['phreeqpython', 'phreeqpython.lib', 'phreeqpython.database'], include_package_data=True, zip_safe=False, install_requires=['periodictable','numpy','scipy'] From 8cdbfb50e6d90dc57aa1a75c87b697c3b7429720 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 13:56:24 +0200 Subject: [PATCH 11/27] Update python-package.yml --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 00a56bf..affb782 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, windows-latest] strategy: fail-fast: false matrix: From 33406d8aeced012c29db27bf560629b0dad61524 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 14:08:36 +0200 Subject: [PATCH 12/27] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1dccb0a..592f4f3 100644 --- a/README.md +++ b/README.md @@ -42,9 +42,9 @@ For more examples, take a look at the `examples` folder. * Using PhreeqPython on Windows requires installing [Visual C++ Redistributable 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48145) ## Unit Tests -| **Mac/Linux** | **Windows** | **Coverage** | -|---|---|---| -| [![Build Status](https://travis-ci.com/Vitens/phreeqpython.svg?branch=master)](https://travis-ci.com/Vitens/phreeqpython) | [![Build status](https://ci.appveyor.com/api/projects/status/lr1jwspxdkgo85bv?svg=true)](https://ci.appveyor.com/project/abelheinsbroek/phreeqpython) | [![codecov](https://codecov.io/gh/Vitens/phreeqpython/branch/master/graph/badge.svg)](https://codecov.io/gh/Vitens/phreeqpython) | +| **Mac/Linux** and **Windows** | **Coverage** | +|---|---| +| [![Build Status](https://github.com/DocMT/phreeqpython/actions/workflows/python-package.yml/badge.svg) | [![codecov](https://codecov.io/gh/Vitens/phreeqpython/branch/master/graph/badge.svg)](https://codecov.io/gh/Vitens/phreeqpython) | ## Acknowledgements From 487ab291c3b8384d4fc7c7205fc3122533310f99 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 14:09:19 +0200 Subject: [PATCH 13/27] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 592f4f3..2ab6e63 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ For more examples, take a look at the `examples` folder. ## Unit Tests | **Mac/Linux** and **Windows** | **Coverage** | |---|---| -| [![Build Status](https://github.com/DocMT/phreeqpython/actions/workflows/python-package.yml/badge.svg) | [![codecov](https://codecov.io/gh/Vitens/phreeqpython/branch/master/graph/badge.svg)](https://codecov.io/gh/Vitens/phreeqpython) | +| [![Build Status](https://github.com/DocMT/phreeqpython/actions/workflows/python-package.yml/badge.svg)] | [![codecov](https://codecov.io/gh/Vitens/phreeqpython/branch/master/graph/badge.svg)](https://codecov.io/gh/Vitens/phreeqpython) | ## Acknowledgements From 2da5456a70dc7c06828c9aff668ccf701e6dafa6 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sat, 28 Jun 2025 14:09:47 +0200 Subject: [PATCH 14/27] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ab6e63..f7609b6 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ For more examples, take a look at the `examples` folder. ## Unit Tests | **Mac/Linux** and **Windows** | **Coverage** | |---|---| -| [![Build Status](https://github.com/DocMT/phreeqpython/actions/workflows/python-package.yml/badge.svg)] | [![codecov](https://codecov.io/gh/Vitens/phreeqpython/branch/master/graph/badge.svg)](https://codecov.io/gh/Vitens/phreeqpython) | +| ![Build Status](https://github.com/DocMT/phreeqpython/actions/workflows/python-package.yml/badge.svg) | [![codecov](https://codecov.io/gh/Vitens/phreeqpython/branch/master/graph/badge.svg)](https://codecov.io/gh/Vitens/phreeqpython) | ## Acknowledgements From 1982a665e8694665d9b3d846c9af471bac597c7f Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sun, 29 Jun 2025 15:29:08 +0200 Subject: [PATCH 15/27] Update python-package.yml --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index affb782..99c16d8 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: [ubuntu-latest, windows-latest] + runs-on: windows-latest strategy: fail-fast: false matrix: From b3cca6beb83be9d2f635c99470873464955bddc1 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sun, 29 Jun 2025 15:32:53 +0200 Subject: [PATCH 16/27] Update python-package.yml --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 99c16d8..00a56bf 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: windows-latest + runs-on: ubuntu-latest strategy: fail-fast: false matrix: From 7143c0c14906f0f99a81eb8a4bf8cfef7fa0c766 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Sun, 29 Jun 2025 15:34:36 +0200 Subject: [PATCH 17/27] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7609b6..817bc77 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ For more examples, take a look at the `examples` folder. ## Unit Tests | **Mac/Linux** and **Windows** | **Coverage** | |---|---| -| ![Build Status](https://github.com/DocMT/phreeqpython/actions/workflows/python-package.yml/badge.svg) | [![codecov](https://codecov.io/gh/Vitens/phreeqpython/branch/master/graph/badge.svg)](https://codecov.io/gh/Vitens/phreeqpython) | +| [![Python package](https://github.com/DocMT/phreeqpython/actions/workflows/python-package.yml/badge.svg)](https://github.com/DocMT/phreeqpython/actions/workflows/python-package.yml)| [![codecov](https://codecov.io/gh/Vitens/phreeqpython/branch/master/graph/badge.svg)](https://codecov.io/gh/Vitens/phreeqpython) | ## Acknowledgements From 72c8ad7369558a3fe809f0a9dfde4e9ca0b58dda Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 14:57:27 +0200 Subject: [PATCH 18/27] Update appveyor.yml Was using old python 3.6 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index bfe5b7d..4d33603 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ build: false environment: matrix: - - PYTHON: "C:\\Python36-x64" + - PYTHON: "C:\\Python39-x64" PYTHON_VERSION: "3.9.1" PYTHON_ARCH: "64" init: From d047395d676f1adcd55d846ac51fb42b98cf21e1 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:04:18 +0200 Subject: [PATCH 19/27] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4d33603..fcfcd72 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ build: false environment: matrix: - PYTHON: "C:\\Python39-x64" - PYTHON_VERSION: "3.9.1" + PYTHON_VERSION: "3.9.13" PYTHON_ARCH: "64" init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" From a8f4e688aa0b1910fcba785801f48d5a95f280db Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:10:21 +0200 Subject: [PATCH 20/27] Update appveyor.yml --- appveyor.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fcfcd72..95e005b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,14 +1,16 @@ build: false environment: - matrix: - - PYTHON: "C:\\Python39-x64" - PYTHON_VERSION: "3.9.13" - PYTHON_ARCH: "64" + matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + - PYTHON: "C:\Python38-x64" + - PYTHON: "C:\Python39-x64" + - PYTHON: "C:\Python310-x64" init: - - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" + - "ECHO %PYTHON% install: + - "%PYTHON%/python.exe -m pip install --upgrade pip" - "%PYTHON%/python.exe -m pip install pytest" - "%PYTHON%/python.exe -m pip install numpy" - "%PYTHON%/python.exe -m pip install scipy" From a1580bde7098160444ded41303df2449e3db7c58 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:13:50 +0200 Subject: [PATCH 21/27] Update appveyor.yml From 9bf26124505412d82dd3485a193ca1ea67da4ee5 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:15:41 +0200 Subject: [PATCH 22/27] Update appveyor.yml --- appveyor.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 95e005b..3fab6a9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,14 +10,14 @@ init: - "ECHO %PYTHON% install: - - "%PYTHON%/python.exe -m pip install --upgrade pip" - - "%PYTHON%/python.exe -m pip install pytest" - - "%PYTHON%/python.exe -m pip install numpy" - - "%PYTHON%/python.exe -m pip install scipy" - - "%PYTHON%/python.exe -m pip install periodictable" - - "%PYTHON%/python.exe -m pip install nose" - - "%PYTHON%/python.exe -m pip install coverage" - - "%PYTHON%/python.exe setup.py install" + - "%PYTHON%/python.exe" -m pip install --upgrade pip + - "%PYTHON%/python.exe" -m pip install pytest + - "%PYTHON%/python.exe" -m pip install numpy + - "%PYTHON%/python.exe" -m pip install scipy + - "%PYTHON%/python.exe" -m pip install periodictable + - "%PYTHON%/python.exe" -m pip install nose + - "%PYTHON%/python.exe" -m pip install coverage + - "%PYTHON%/python.exe" setup.py install test_script: - - "%PYTHON%/python.exe -m pytest -v" + - "%PYTHON%/python.exe" -m pytest -v From 87157b946b2f4184edc147032e3acedd76ad6d76 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:19:09 +0200 Subject: [PATCH 23/27] Update appveyor.yml From 13ce0f9cd6a5419ee58588833a2cb588fd223fc5 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:19:27 +0200 Subject: [PATCH 24/27] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3fab6a9..835c9a4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ environment: - PYTHON: "C:\Python39-x64" - PYTHON: "C:\Python310-x64" init: - - "ECHO %PYTHON% + - "ECHO %PYTHON%" install: - "%PYTHON%/python.exe" -m pip install --upgrade pip From 5a69d43c07a79583752ca02f5d32e2836db3b2ea Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:21:49 +0200 Subject: [PATCH 25/27] Update appveyor.yml --- appveyor.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 835c9a4..f53a65e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,14 +10,14 @@ init: - "ECHO %PYTHON%" install: - - "%PYTHON%/python.exe" -m pip install --upgrade pip - - "%PYTHON%/python.exe" -m pip install pytest - - "%PYTHON%/python.exe" -m pip install numpy - - "%PYTHON%/python.exe" -m pip install scipy - - "%PYTHON%/python.exe" -m pip install periodictable - - "%PYTHON%/python.exe" -m pip install nose - - "%PYTHON%/python.exe" -m pip install coverage - - "%PYTHON%/python.exe" setup.py install + - "%PYTHON%/python.exe -m pip install --upgrade pip" + - "%PYTHON%/python.exe -m pip install pytest" + - "%PYTHON%/python.exe -m pip install numpy" + - "%PYTHON%/python.exe -m pip install scipy" + - "%PYTHON%/python.exe -m pip install periodictable" + - "%PYTHON%/python.exe -m pip install nose" + - "%PYTHON%/python.exe -m pip install coverage" + - "%PYTHON%/python.exe setup.py install" test_script: - - "%PYTHON%/python.exe" -m pytest -v + - "%PYTHON%/python.exe -m pytest -v" From 6ad40a86c3b580363f177bc69de195cd098c6117 Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:23:52 +0200 Subject: [PATCH 26/27] Update appveyor.yml --- appveyor.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f53a65e..e504f6e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,10 +2,9 @@ build: false environment: matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - - PYTHON: "C:\Python38-x64" - - PYTHON: "C:\Python39-x64" - - PYTHON: "C:\Python310-x64" + - PYTHON: "C:\\Python38-x64" + - PYTHON: "C:\\Python39-x64" + - PYTHON: "C:\\Python310-x64" init: - "ECHO %PYTHON%" From 4a4d6ede069b1ddf6bdf180e2947cb20a247250d Mon Sep 17 00:00:00 2001 From: "Michael T. Ringel" <70267658+DocMT@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:31:55 +0200 Subject: [PATCH 27/27] Update appveyor.yml --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e504f6e..11438cc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,6 @@ build: false environment: matrix: - PYTHON: "C:\\Python38-x64" - - PYTHON: "C:\\Python39-x64" - - PYTHON: "C:\\Python310-x64" init: - "ECHO %PYTHON%"