From 23c366c7e76517dc32129880324bdd5e40f9b666 Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Wed, 14 Feb 2024 17:29:38 -0600 Subject: [PATCH 1/2] readme: update readme and installation.md --- .github/workflows/main.yml | 4 ++++ .github/workflows/pymake-gcc.yml | 4 ++++ .github/workflows/pymake-requests.yml | 4 ++++ README.md | 6 +++--- docs/installation.md | 6 +++--- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 84a0f0b3..75425049 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,10 +4,14 @@ on: schedule: - cron: '0 7 * * *' # run at 7 AM UTC every day push: + paths-ignore: + - '**.md' pull_request: branches: - master - develop + paths-ignore: + - '**.md' jobs: pymakeCI-os-intel: diff --git a/.github/workflows/pymake-gcc.yml b/.github/workflows/pymake-gcc.yml index 9b4d9095..69d1c610 100644 --- a/.github/workflows/pymake-gcc.yml +++ b/.github/workflows/pymake-gcc.yml @@ -4,10 +4,14 @@ on: schedule: - cron: '0 7 * * *' # run at 7 AM UTC every day push: + paths-ignore: + - '**.md' pull_request: branches: - master - develop + paths-ignore: + - '**.md' jobs: pymakeCI-os-gcc: diff --git a/.github/workflows/pymake-requests.yml b/.github/workflows/pymake-requests.yml index 7418fcc6..3a7564f1 100644 --- a/.github/workflows/pymake-requests.yml +++ b/.github/workflows/pymake-requests.yml @@ -4,10 +4,14 @@ on: schedule: - cron: '0 7 * * *' # run at 7 AM UTC every day push: + paths-ignore: + - '**.md' pull_request: branches: - master - develop + paths-ignore: + - '**.md' jobs: pymakeCI-requests: diff --git a/README.md b/README.md index 5f732e0d..6351c29c 100644 --- a/README.md +++ b/README.md @@ -230,14 +230,14 @@ To install pymake using conda type: conda install -c conda-forge mfpymake ``` -To install pymake directly from the git repository type: +To install the latest pymake release directly from the git repository type: ``` pip install https://github.com/modflowpy/pymake/zipball/master ``` -To update your version of pymake with the latest from the git repository type: +To update your version of pymake with the latest development version from the git repository type: ``` -pip install https://github.com/modflowpy/pymake/zipball/master --upgrade +pip install https://github.com/modflowpy/pymake/zipball/develop --upgrade ``` diff --git a/docs/installation.md b/docs/installation.md index ad7f101e..6775b1f8 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -6,13 +6,13 @@ To install a stable version from PyPI: pip install mfpymake ``` -To install pymake directly from the git repository type: +To install the latest pymake release directly from the git repository type: ``` pip install https://github.com/modflowpy/pymake/zipball/master ``` -To update your version of pymake with the latest from the git repository type: +To update your version of pymake with the latest development version from the git repository type: ``` -pip install https://github.com/modflowpy/pymake/zipball/master --upgrade +pip install https://github.com/modflowpy/pymake/zipball/develop --upgrade From 159153079a7716868f4469cb38e5ef24c2d4772a Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Thu, 15 Feb 2024 09:26:33 -0600 Subject: [PATCH 2/2] readme: update readme and installation.md --- .github/workflows/main.yml | 6 ++++-- .github/workflows/pymake-gcc.yml | 6 ++++-- .github/workflows/pymake-linting-install.yml | 1 + .github/workflows/pymake-requests.yml | 6 ++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 75425049..8c81ad31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,13 +5,15 @@ on: - cron: '0 7 * * *' # run at 7 AM UTC every day push: paths-ignore: - - '**.md' + - 'README.md' + - 'docs/*.md' pull_request: branches: - master - develop paths-ignore: - - '**.md' + - 'README.md' + - 'docs/*.md' jobs: pymakeCI-os-intel: diff --git a/.github/workflows/pymake-gcc.yml b/.github/workflows/pymake-gcc.yml index 69d1c610..81d2a821 100644 --- a/.github/workflows/pymake-gcc.yml +++ b/.github/workflows/pymake-gcc.yml @@ -5,13 +5,15 @@ on: - cron: '0 7 * * *' # run at 7 AM UTC every day push: paths-ignore: - - '**.md' + - 'README.md' + - 'docs/*.md' pull_request: branches: - master - develop paths-ignore: - - '**.md' + - 'README.md' + - 'docs/*.md' jobs: pymakeCI-os-gcc: diff --git a/.github/workflows/pymake-linting-install.yml b/.github/workflows/pymake-linting-install.yml index fdd66be8..dca94a22 100644 --- a/.github/workflows/pymake-linting-install.yml +++ b/.github/workflows/pymake-linting-install.yml @@ -6,6 +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 3a7564f1..e1bdc1c9 100644 --- a/.github/workflows/pymake-requests.yml +++ b/.github/workflows/pymake-requests.yml @@ -5,13 +5,15 @@ on: - cron: '0 7 * * *' # run at 7 AM UTC every day push: paths-ignore: - - '**.md' + - 'README.md' + - 'docs/*.md' pull_request: branches: - master - develop paths-ignore: - - '**.md' + - 'README.md' + - 'docs/*.md' jobs: pymakeCI-requests: