Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a57f6e4
ci(release): update version to 1.2.11.dev0
wpbonelli Jun 17, 2024
baa302e
Merge pull request #192 from modflowpy/post-release-1.2.10-reset
wpbonelli Jun 17, 2024
e60412a
ci: fix schedule for windows (#193)
jdhughes-dev Jun 18, 2024
91f1576
fix(requests): update available assets (#194)
jdhughes-dev Jun 21, 2024
2f58d33
chore: reformat Python code with line length = 88 (#198)
mwtoews Nov 21, 2024
feb8adf
fix: cleanup _get_optlevel verbose param in pymake_base (#199)
mjreno Nov 22, 2024
996f8dc
refactor: clean-up strings and Path related aspects, add a few Ruff r…
mwtoews Nov 29, 2024
0244135
build(deps): bump dawidd6/action-download-artifact from 6 to 7 (#201)
dependabot[bot] Nov 29, 2024
e18d42b
update for mf6.6.0 (#203)
jdhughes-dev Dec 20, 2024
036620c
ci: fix release code.md path (#205)
jdhughes-dev Dec 20, 2024
e4197a9
Merge branch 'master' into develop
jdhughes-dev Dec 20, 2024
7096a77
sync master and update version
jdhughes-dev Dec 20, 2024
085c7a3
refactor(makefile): changes to makefile generation to limit changes (…
jdhughes-dev Jan 27, 2025
581b874
ci: pin ubuntu-22.04 for now (#209)
wpbonelli Jan 28, 2025
807338c
chore: replace setuptools with hatchling (#210)
mwtoews Feb 12, 2025
1ffb830
build(deps): bump prefix-dev/setup-pixi from 0.8.1 to 0.8.2 (#211)
dependabot[bot] Feb 12, 2025
77057db
update mf6 and zbud6 version (#212)
jdhughes-dev Feb 12, 2025
737d80d
chore: fix typos and add codespell configuration (#213)
mwtoews Feb 13, 2025
b9f449e
ci: update scheduled workflow (#214)
jdhughes-dev Feb 13, 2025
d4494f9
Release v1.4.0
jdhughes-dev Feb 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- {os: macos-latest, FC: gcc, FC_V: 13, shell: bash}
- {os: windows-latest, FC: gcc, FC_V: 13, shell: pwsh}
# test latest python and intel-classic
- {os: ubuntu-latest, FC: intel-classic, FC_V: 2021.7, shell: bash}
- {os: ubuntu-22.04, FC: intel-classic, FC_V: 2021.7, shell: bash}
- {os: macos-13, FC: intel-classic, FC_V: 2021.7, shell: bash}
- {os: windows-2019, FC: intel-classic, FC_V: 2021.7, shell: pwsh}
# test latest python and previous gcc
Expand All @@ -55,7 +55,7 @@ jobs:
uses: ts-graphviz/setup-graphviz@v2

- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.8.1
uses: prefix-dev/setup-pixi@v0.8.2
with:
pixi-version: v0.34.0
manifest-path: "pixi.toml"
Expand All @@ -66,7 +66,7 @@ jobs:
pixi run postinstall

- name: Setup ${{ matrix.FC }} ${{ matrix.FC_V }} on ${{ matrix.os }}
uses: fortran-lang/setup-fortran@main
uses: fortran-lang/setup-fortran@v1
with:
compiler: ${{ matrix.FC }}
version: ${{ matrix.FC_V }}
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
- {os: macos-latest, FC: gcc, FC_V: 13, shell: bash}
- {os: windows-latest, FC: gcc, FC_V: 13, shell: pwsh}
# test latest python and intel
- {os: ubuntu-latest, FC: intel-classic, FC_V: 2021.7, shell: bash}
- {os: ubuntu-22.04, FC: intel-classic, FC_V: 2021.7, shell: bash}
- {os: macos-13, FC: intel-classic, FC_V: 2021.7, shell: bash}
- {os: windows-2019, FC: intel-classic, FC_V: 2021.7, shell: pwsh}
defaults:
Expand All @@ -146,7 +146,7 @@ jobs:
uses: ts-graphviz/setup-graphviz@v2

- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.8.1
uses: prefix-dev/setup-pixi@v0.8.2
with:
pixi-version: v0.34.0
manifest-path: "pixi.toml"
Expand All @@ -157,7 +157,7 @@ jobs:
pixi run postinstall

- name: Setup ${{ matrix.FC }} ${{ matrix.FC_V }} on ${{ matrix.os }}
uses: fortran-lang/setup-fortran@main
uses: fortran-lang/setup-fortran@v1
with:
compiler: ${{ matrix.FC }}
version: ${{ matrix.FC_V }}
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/pymake-linting-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.8.1
uses: prefix-dev/setup-pixi@v0.8.2
with:
pixi-version: v0.34.0
manifest-path: "pixi.toml"
Expand All @@ -35,6 +35,9 @@ jobs:
- name: Check format
run: pixi run check-format

- name: Check spelling
run: pixi run check-spelling

pymake_setup:
name: standard installation
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pymake-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.8.1
uses: prefix-dev/setup-pixi@v0.8.2
with:
pixi-version: v0.34.0
manifest-path: "pixi.toml"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
command: make-code-json

- name: Upload code.md
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: code.md
path: code.md
Expand Down
6 changes: 0 additions & 6 deletions MANIFEST.in

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Python package for building MODFLOW-based programs from source files.

### Version 1.3.0
### Version 1.4.0.dev0

[![PyPI Version](https://img.shields.io/pypi/v/mfpymake.png)](https://pypi.python.org/pypi/mfpymake)
[![Anaconda Version](https://anaconda.org/conda-forge/mfpymake/badges/version.svg)](https://anaconda.org/conda-forge/mfpymake)
Expand Down Expand Up @@ -101,7 +101,7 @@ options:
List of extra source files to exclude from the compilation. excludefiles can be either a list of files or the name of a text file that contains a list of files. (default is None)
-so, --sharedobject Create shared object or dll on Windows. (default is False)
-ad APPDIR, --appdir APPDIR
Target path that overides path defined target path (default is None)
Target path that overrides path defined target path (default is None)
-v, --verbose Verbose output to terminal. (default is False)
--keep Keep existing executable. (default is False)
--zip ZIP Zip built executable. (default is None)
Expand Down
4 changes: 2 additions & 2 deletions docs/build_apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ options:
Additional C/C++ compiler flags. C/C++ compiler flags should be enclosed in quotes and start with a blank space or separated from the name (-cf or --cflags) with a equal sign
(-cf='-O3'). (default is None)
-ad APPDIR, --appdir APPDIR
Target path that overides path defined target path (default is None)
Target path that overrides path defined target path (default is None)
-v, --verbose Verbose output to terminal. (default is False)
--keep Keep existing executable. (default is False)
--zip ZIP Zip built executable. (default is None)
Expand Down Expand Up @@ -60,7 +60,7 @@ connection), unzips the distribution file, sets the pymake settings required to
source files to build the program. MT3DMS will be downloaded from the University of Alabama and Triangle will be
downloaded from [netlib.org](http://www.netlib.org/voronoi/triangle.zip). Optional command line arguments can be used to
customize the build (`-fc`, `-cc`, `--fflags`, etc.). For example, MODFLOW 6 could be built using intel compilers and
an `O3` optimation level by specifying:
an `O3` optimization level by specifying:

```console
make-program mf6 -fc=ifort --fflags='-O3'
Expand Down
4 changes: 2 additions & 2 deletions docs/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mfpymake -h
```

The help message identifies required positional arguments and optional
arguments that can be provided to overide default values.
arguments that can be provided to override default values.

```
usage: mfpymake [-h] [-fc {ifort,mpiifort,gfortran,none}]
Expand Down Expand Up @@ -97,7 +97,7 @@ optional arguments:
-so, --sharedobject Create shared object or dll on Windows. (default is
False)
-ad APPDIR, --appdir APPDIR
Target path that overides path defined target path
Target path that overrides path defined target path
(default is None)
-v, --verbose Verbose output to terminal. (default is False)
--keep Keep existing executable. (default is False)
Expand Down
Loading