Skip to content

Commit

Permalink
Merge pull request #95 from WikiWatershed/tt/94/python-3.10
Browse files Browse the repository at this point in the history
Closes #94
  • Loading branch information
rajadain authored Jul 3, 2024
2 parents b074bf7 + 286d82a commit 94efc68
Show file tree
Hide file tree
Showing 9 changed files with 485 additions and 221 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This workflow will install Python dependencies, run tests and lint for Python 3.9
# This workflow will install Python dependencies, run tests and lint for Python 3.10
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Test
Expand All @@ -16,12 +16,12 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.9"]
python-version: ["3.9", "3.10"]

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
Expand Down
22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

10 changes: 5 additions & 5 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ name = "pypi"
[packages]
certifi = "==2021.5.30"
funcsigs = "==1.0.2"
llvmlite = "==0.37.0"
nose = "==1.3.7"
numpy = "==1.20.3"
numba = "==0.54.0"
llvmlite = "==0.38.*"
pynose = "==1.5.*"
numpy = "==1.21.*"
numba = "==0.55.*"

[dev-packages]
build = "*"
twine = "*"

[requires]
python_version = "3.9"
python_version = "3.10"
640 changes: 463 additions & 177 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $ pip install gwlf-e

## Development

Ensure you have Python 3.9 and [pipenv](https://pipenv.pypa.io/en/latest/) available. Then run:
Ensure you have Python 3.10 and [pipenv](https://pipenv.pypa.io/en/latest/) available. Then run:

```bash
$ pipenv sync
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ requires = [
"setuptools>=42",
"wheel>=0.31",
"twine>=1.11",
'numba==0.54.0',
'numba==0.55.*',
]
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
certifi==2021.5.30
funcsigs==1.0.2
llvmlite==0.37.0
nose==1.3.7
numpy==1.20.3
numba==0.54.0
llvmlite==0.38.*
pynose==1.5.*
numpy==1.21.*
numba==0.55.*
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
long_description = f.read()

tests_require = [
'nose == 1.3.7',
'pynose == 1.5.*',
'coverage == 4.0.3'
]

Expand All @@ -54,10 +54,10 @@
install_requires=[
'certifi==2021.5.30',
'funcsigs==1.0.2',
'llvmlite==0.37.0',
'nose==1.3.7',
'numpy==1.20.3',
'numba==0.54.0',
'llvmlite==0.38.*',
'pynose==1.5.*',
'numpy==1.21.*',
'numba==0.55.*',
],
extras_require={
'dev': [],
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[tox]
envlist = py39
envlist = py310

[testenv]
basepython =
py39: python3.9
py310: python3.10
deps =
check-manifest
readme_renderer
Expand Down

0 comments on commit 94efc68

Please sign in to comment.