diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79da2ea..e9d1585 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: build -on: +on: push: pull_request: schedule: @@ -15,14 +15,14 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.11.0", "3.12.0"] env: OS: ${{ matrix.os }} PYTHON: ${{ matrix.python-version }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -37,7 +37,7 @@ jobs: run: | pytest --cov=dorado/ --cov-report=xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} file: ./coverage.xml @@ -51,14 +51,14 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: ["3.9"] + python-version: ["3.11.0"] env: OS: ${{ matrix.os }} PYTHON: ${{ matrix.python-version }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -90,13 +90,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: persist-credentials: false - - name: Set up Python 3.9 - uses: actions/setup-python@v2 + - name: Set up Python 3.11.0 + uses: actions/setup-python@v5 with: - python-version: '3.9' + python-version: '3.11.0' - name: Install dependencies run: | python -m pip install --upgrade pip @@ -121,7 +121,7 @@ jobs: echo ${{ github.ref == 'refs/heads/master' }} echo ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - name: Deploy to GitHub Pages - uses: JamesIves/github-pages-deploy-action@3.7.1 + uses: JamesIves/github-pages-deploy-action@v4 if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0debf72..9a9e853 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,9 +14,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.x' - name: Install dependencies diff --git a/README.md b/README.md index d703b3b..bcd6733 100644 --- a/README.md +++ b/README.md @@ -25,12 +25,12 @@ For user guides and detailed examples, refer to the [documentation](https://pass ## Installation: -dorado supports Python 3.5+. For the full distribution including examples, clone this repository using `git clone` and run `python setup.py install` from the cloned directory. To test this "full" installation, you must first install `pytest` via `pip install pytest`. Then from the cloned directory the command `pytest` can be run to ensure that your installed distribution passes all of the unit tests. +dorado supports Python 3.11+. For the full distribution including examples, clone this repository using `git clone` and run `python setup.py install` from the cloned directory. To test this "full" installation, you must first install `pytest` via `pip install pytest`. Then from the cloned directory the command `pytest` can be run to ensure that your installed distribution passes all of the unit tests. For a lightweight distribution including just the core functionality, use `pip` to install via PyPI: pip install pydorado - + Installation using `conda` via `conda-forge` is also supported: conda install -c conda-forge pydorado diff --git a/docs/source/install/index.rst b/docs/source/install/index.rst index 24ad21e..723907a 100644 --- a/docs/source/install/index.rst +++ b/docs/source/install/index.rst @@ -4,7 +4,7 @@ Installation Instructions ========================= -dorado is compatible with Python 3.5+. There are only 4 dependencies: `numpy `_, `matplotlib `_, `scipy `_, `future `_, and `tqdm `_. +dorado is compatible with Python 3.11+. There are only 4 dependencies: `numpy `_, `matplotlib `_, `scipy `_, `future `_, and `tqdm `_. Installation via `pip` ---------------------- @@ -13,7 +13,7 @@ To `pip`-install this package, first ensure that you have the dependencies liste :: $ pip install pydorado - + Installation via `conda` ------------------------ diff --git a/dorado/__init__.py b/dorado/__init__.py index b5a99ac..9182450 100644 --- a/dorado/__init__.py +++ b/dorado/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.5.3" +__version__ = "2.5.4" from . import lagrangian_walker from . import parallel_routing diff --git a/dorado/particle_track.py b/dorado/particle_track.py index ed84205..d017de0 100644 --- a/dorado/particle_track.py +++ b/dorado/particle_track.py @@ -1203,7 +1203,7 @@ def unstruct2grid(coordinates, if k_nearest_neighbors == 1: # Only use nearest neighbor index_qFun = interpolate.NearestNDInterpolator(inputXY, np.arange(len(x), dtype='int64').transpose()) - gridqInd = index_qFun(gridXY_array) + gridqInd = index_qFun(gridXY_array).astype(int) # Function to do the interpolation def interp_func(data): diff --git a/setup.py b/setup.py index 0fc01f0..4f39dfa 100644 --- a/setup.py +++ b/setup.py @@ -13,11 +13,10 @@ package_data = {'' : ['*.txt', '*.npz']}, long_description = 'See project webpage for details: https://github.com/passaH2O/dorado', classifiers = [ - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11'], + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', + 'Programming Language :: Python :: 3.14'], install_requires = ['numpy','matplotlib','scipy', 'future','tqdm'], )