-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from mcflugen/mcflugen/update-supported-pythons
Update repository for newer Pythons, packaging standards
- Loading branch information
Showing
35 changed files
with
4,815 additions
and
4,174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
name: Test | ||
|
||
on: [push, pull_request] | ||
|
||
jobs: | ||
build-and-test: | ||
name: Run the tests | ||
# We want to run on external PRs, but not on our own internal PRs as they'll be run | ||
# by the push to the branch. Without this if check, checks are duplicated since | ||
# internal PRs match both the push and pull_request events. | ||
if: | ||
github.event_name == 'push' || github.event.pull_request.head.repo.full_name != | ||
github.repository | ||
|
||
runs-on: ${{ matrix.os }} | ||
|
||
defaults: | ||
run: | ||
shell: bash -l {0} | ||
|
||
strategy: | ||
matrix: | ||
os: [ubuntu-latest, macos-latest, windows-latest] | ||
python-version: ["3.10", "3.11", "3.12"] | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
|
||
- uses: conda-incubator/setup-miniconda@v2 | ||
with: | ||
python-version: ${{ matrix.python-version }} | ||
miniforge-variant: Miniforge3 | ||
miniforge-version: latest | ||
auto-update-conda: true | ||
|
||
- name: Show conda installation info | ||
run: | | ||
conda info | ||
conda list | ||
- name: Test | ||
run: | | ||
pip install nox | ||
nox -s test --force-pythons="${{ matrix.python-version }}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,6 +35,7 @@ pip-delete-this-directory.txt | |
|
||
# Unit test / coverage reports | ||
htmlcov/ | ||
.nox/ | ||
.tox/ | ||
.coverage | ||
.cache | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
repos: | ||
- repo: https://github.com/psf/black | ||
rev: 23.11.0 | ||
hooks: | ||
- id: black | ||
name: black | ||
description: "Black: The uncompromising Python code formatter" | ||
entry: black | ||
language: python | ||
language_version: python3 | ||
minimum_pre_commit_version: 2.9.2 | ||
require_serial: true | ||
types_or: [python, pyi] | ||
|
||
- repo: https://github.com/pycqa/flake8 | ||
rev: 6.1.0 | ||
hooks: | ||
- id: flake8 | ||
# args: [--select=B028] | ||
args: [ | ||
# --select=B028, | ||
"--extend-ignore=E722,B001" | ||
] | ||
additional_dependencies: | ||
- flake8-bugbear | ||
- flake8-comprehensions | ||
- flake8-simplify | ||
|
||
- repo: https://github.com/asottile/pyupgrade | ||
rev: v3.15.0 | ||
hooks: | ||
- id: pyupgrade | ||
args: [--py310-plus] | ||
|
||
- repo: https://github.com/PyCQA/isort | ||
rev: 5.12.0 | ||
hooks: | ||
- id: isort | ||
files: \.py$ | ||
|
||
- repo: https://github.com/pre-commit/pre-commit-hooks | ||
rev: v4.5.0 | ||
hooks: | ||
- id: check-builtin-literals | ||
- id: check-added-large-files | ||
- id: check-case-conflict | ||
- id: check-toml | ||
- id: check-yaml | ||
exclude: | | ||
(?x)^( | ||
conda/meta.yaml | ||
) | ||
- id: debug-statements | ||
- id: end-of-file-fixer | ||
- id: forbid-new-submodules | ||
- id: mixed-line-ending | ||
- id: trailing-whitespace | ||
|
||
- repo: https://github.com/regebro/pyroma | ||
rev: "4.2" | ||
hooks: | ||
- id: pyroma | ||
args: ["-d", "--min=10", "."] | ||
|
||
# - repo: https://github.com/mgedmin/check-manifest | ||
# rev: "0.49" | ||
# hooks: | ||
# - id: check-manifest | ||
# args: ["--ignore=.nox,build", "--no-build-isolation"] | ||
|
||
# - repo: https://github.com/PyCQA/pydocstyle | ||
# rev: 6.3.0 | ||
# hooks: | ||
# - id: pydocstyle | ||
# files: landlab/.*\.py$ | ||
# args: | ||
# - --convention=numpy | ||
# - --add-select=D417 | ||
# additional_dependencies: [".[toml]"] |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# Credits | ||
|
||
## Development Lead | ||
|
||
* [Andrew D. Wickert](https://github.com/awickert) | ||
|
||
## Contributors | ||
|
||
None yet. Why not be the first? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
# Release Notes | ||
|
||
## [1.1.1](https://github.com/awickert/gFlex/releases/tag/v1.1.1) - 2021-06-26 | ||
|
||
- Updated PyPI support: twine upload, README.md | ||
- Throw meaningful error if a nonuniform self.Te grid is used with the | ||
analytical solution | ||
|
||
## [1.1.0](https://github.com/awickert/gFlex/releases/tag/v1.1.0) - 2018-05-28 | ||
|
||
- Support for both Python 2 and Python 3 | ||
- Main code | ||
- Examples | ||
- README.md updates | ||
- PATH updates in | ||
- Code tests included | ||
- Code testing on commit by Travis | ||
- Updated on PyPI | ||
|
||
## [1.0.1](https://github.com/awickert/gFlex/releases/tag/v1.0.1) - 2018-05-25 | ||
|
||
- Final Python 2 (only) release | ||
- Additional documentation added | ||
|
||
## [1.0.0](https://github.com/awickert/gFlex/releases/tag/v1.0.0) - 2017-05-10 | ||
|
||
This is the update is what is available now from pypi. | ||
|
||
- Minor updates to the main gFlex codes | ||
- Addition of a missing "12" in the flexural wavelength calculator in the utilities. | ||
|
||
|
||
## [1.0](https://github.com/awickert/gFlex/releases/tag/v1.0) - 2016-01-28 | ||
|
||
- First full release of gFlex in association with the now-accepted GMD paper, | ||
"Open-source modular solutions for flexural isostasy: gFlex v1.0", by A. D. Wickert. | ||
|
||
|
||
## [0.9](https://github.com/awickert/gFlex/releases/tag/v0.9) - 2015-03-05 | ||
|
||
- Release submitted to GMD and that appears on PyPI; this is the same as v1.0a | ||
on umn-earth-surface. | ||
|
||
## [0.8.1](https://github.com/awickert/gFlex/releases/tag/v0.8.1) - 2015-03-04 | ||
|
||
- Fixed error in PyPI integration from v0.8 and updated README.md to include | ||
PyPI integration. | ||
|
||
|
||
## [0.8](https://github.com/awickert/gFlex/releases/tag/v0.8) - 2015-03-04 | ||
|
||
- First fully-functional and error-checked release, and therefore the first | ||
true non-"pre-release". | ||
|
||
|
||
## [0.7](https://github.com/awickert/gFlex/releases/tag/0.7) - 2015-01-21 | ||
|
||
This release may be short-lived, but is the turning point at which work | ||
on gFlex will go from fixing deficiencies to adding new capabilities. | ||
As such, it is receiving version 0.7 (the last version of its parent project, | ||
"Flexure", was 0.6 back in 2012). It now seems to be functional and stable, | ||
and thus this tagged release will be the basis for this stage of the model | ||
to be pulled to @csdms-contrib and @umn-earth-surface. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
include AUTHORS.md | ||
include CHANGES.md | ||
include LICENSE.md | ||
include README.md | ||
include CITATION.cff | ||
include requirements* | ||
include noxfile.py | ||
|
||
recursive-include gflex | ||
recursive-include tests *py | ||
|
||
exclude .pre-commit-config.yaml | ||
exclude gflex_bmi.py | ||
exclude topypi-test.sh | ||
exclude topypi.sh | ||
|
||
recursive-exclude conda * | ||
recursive-exclude input * | ||
recursive-exclude utilities * |
Oops, something went wrong.