From 910112aaef57161001ae82e6efe6441ad5a86366 Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Mon, 12 Feb 2024 11:07:28 -0600 Subject: [PATCH 1/2] chore: bump version to 1.2.10.dev0 --- README.md | 2 +- pymake/config.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e0daf37..5f732e0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Python package for building MODFLOW-based programs from source files. -### Version 1.2.9.dev0 +### Version 1.2.10.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) diff --git a/pymake/config.py b/pymake/config.py index b1f377a..e54f09b 100644 --- a/pymake/config.py +++ b/pymake/config.py @@ -1,6 +1,6 @@ __author__ = "Joseph D. Hughes" -__date__ = "February 11, 2024" -__version__ = "1.2.9" +__date__ = "February 12, 2024" +__version__ = "1.2.10.dev0" __maintainer__ = "Joseph D. Hughes" __email__ = "jdhughes@usgs.gov" __status__ = "Production" From c1fab116b06523680b391eed33c779ec07a90918 Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Mon, 12 Feb 2024 11:11:25 -0600 Subject: [PATCH 2/2] update workflows to include develop branch --- .github/workflows/main.yml | 1 + .github/workflows/pymake-gcc.yml | 1 + .github/workflows/pymake-linting-install.yml | 2 +- .github/workflows/pymake-requests.yml | 1 + .github/workflows/pymake-rtd.yml | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20d107a..84a0f0b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - master + - develop jobs: pymakeCI-os-intel: diff --git a/.github/workflows/pymake-gcc.yml b/.github/workflows/pymake-gcc.yml index 68af526..9b4d909 100644 --- a/.github/workflows/pymake-gcc.yml +++ b/.github/workflows/pymake-gcc.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - master + - develop jobs: pymakeCI-os-gcc: diff --git a/.github/workflows/pymake-linting-install.yml b/.github/workflows/pymake-linting-install.yml index 2c79b7b..fdd66be 100644 --- a/.github/workflows/pymake-linting-install.yml +++ b/.github/workflows/pymake-linting-install.yml @@ -6,7 +6,7 @@ on: push: pull_request: branches: - - master + - develop jobs: diff --git a/.github/workflows/pymake-requests.yml b/.github/workflows/pymake-requests.yml index e889fbc..7418fcc 100644 --- a/.github/workflows/pymake-requests.yml +++ b/.github/workflows/pymake-requests.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - master + - develop jobs: pymakeCI-requests: diff --git a/.github/workflows/pymake-rtd.yml b/.github/workflows/pymake-rtd.yml index 49e6f8d..65907cc 100644 --- a/.github/workflows/pymake-rtd.yml +++ b/.github/workflows/pymake-rtd.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - master + - develop jobs: pymake_rtd: