Skip to content

Commit

Permalink
Merge branch 'release/3.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
rajadain committed Jul 9, 2024
2 parents d5fe59d + 40cdce8 commit 5b2ce21
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 45 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ jobs:
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: Compile AOT functions
run: |
python setup.py build
- name: Test with nosetests
run: |
nosetests --verbosity=2
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 3.3.0

- Upgrade to NumPy 1.22 to fix compiling with Numba 0.55

## 3.2.0

- Add support for Python 3.9, 3.10
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ certifi = ">=2021"
funcsigs = "==1.0.2"
llvmlite = "==0.38.*"
pynose = "==1.5.*"
numpy = "==1.21.*"
numpy = "==1.22.*"
numba = "==0.55.*"

[dev-packages]
Expand Down
71 changes: 31 additions & 40 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ $ pip install --no-build-isolation gwlf-e
Ensure you have Python 3.10 and [pipenv](https://pipenv.pypa.io/en/latest/) available. Then run:

```bash
$ pipenv sync
$ pipenv sync --dev
$ pipenv run python setup.py build
```

### Running Locally
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ certifi>=2021
funcsigs==1.0.2
llvmlite==0.38.*
pynose==1.5.*
numpy==1.21.*
numpy==1.22.*
numba==0.55.*
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

setup(
name='gwlf-e',
version='3.2.0',
version='3.3.0',
description='A Python port of Generalized Watersheds Loading Functions - Enhanced (MapShed)',
long_description=long_description,
long_description_content_type='text/markdown',
Expand All @@ -56,7 +56,7 @@
'funcsigs==1.0.2',
'llvmlite==0.38.*',
'pynose==1.5.*',
'numpy==1.21.*',
'numpy==1.22.*',
'numba==0.55.*',
],
extras_require={
Expand Down

0 comments on commit 5b2ce21

Please sign in to comment.