Skip to content

Commit ba9e059

Browse files
hmgaudeckerhmgaudecker
authored
Update GHA workflow (#30)
1 parent d1fd493 commit ba9e059

File tree

8 files changed

+63
-45
lines changed

8 files changed

+63
-45
lines changed

‎.github/workflows/main.yml

+19-16
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ jobs:
3030
python-version: ['3.8', '3.9', '3.10', '3.11']
3131

3232
steps:
33-
- uses: actions/checkout@v2
34-
- uses: conda-incubator/setup-miniconda@v2
33+
- uses: actions/checkout@v3
34+
- uses: mamba-org/provision-with-micromamba@main
3535
with:
36-
auto-update-conda: false
37-
python-version: ${{ matrix.python-version }}
36+
environment-file: false
37+
environment-name: gha-testing
3838
channels: conda-forge,nodefaults
39-
mamba-version: "*"
40-
41-
- name: Install core dependencies.
42-
shell: bash -l {0}
43-
run: mamba install -c conda-forge tox-conda coverage
39+
extra-specs: |
40+
python=${{ matrix.python-version }}
41+
mamba
42+
tox-conda
43+
cache-downloads: true
4444

4545
- name: Run end-to-end tests.
4646
shell: bash -l {0}
@@ -58,14 +58,17 @@ jobs:
5858
runs-on: ubuntu-latest
5959

6060
steps:
61-
- uses: actions/checkout@v2
62-
- uses: conda-incubator/setup-miniconda@v2
61+
- uses: actions/checkout@v3
62+
- uses: mamba-org/provision-with-micromamba@main
6363
with:
64-
auto-update-conda: false
65-
66-
- name: Install core dependencies.
67-
shell: bash -l {0}
68-
run: conda install -c conda-forge tox-conda
64+
environment-file: false
65+
environment-name: gha-docs
66+
channels: conda-forge,nodefaults
67+
extra-specs: |
68+
python=3.11
69+
mamba
70+
tox-conda
71+
cache-downloads: true
6972

7073
- name: Build docs
7174
shell: bash -l {0}

‎hooks/post_gen_project.py

+15-3
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,30 @@ def main() -> None:
6060
)
6161

6262
if "{{ cookiecutter.create_conda_environment_at_finish }}" == "yes":
63+
6364
if shutil.which("mamba") is not None:
6465
conda_exe = shutil.which("mamba")
6566
else:
6667
conda_exe = shutil.which("conda")
6768

68-
if conda_exe is None:
69+
if conda_exe:
70+
subprocess.run(
71+
(
72+
conda_exe,
73+
"env",
74+
"create",
75+
"-f",
76+
(project_path / "environment.yml").absolute().as_posix(),
77+
"--force",
78+
),
79+
check=True,
80+
capture_output=True,
81+
)
82+
else:
6983
warnings.warn(
7084
"conda environment could not be created since no conda or mamba "
7185
"executable was found."
7286
)
73-
else:
74-
subprocess.run((conda_exe, "env", "create"), check=True)
7587

7688

7789
if __name__ == "__main__":

‎{{cookiecutter.project_slug}}/.github/ISSUE_TEMPLATE/bug_report.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
name: Bug Report
4-
about: Create a bug report to help us improve {{ cookiecutter.project_slug }}
4+
about: Create a bug report to help us improve {{ cookiecutter.project_name }}
55
title: "BUG:"
66
labels: "bug"
77

@@ -10,10 +10,10 @@ labels: "bug"
1010
- [ ] I have checked that this issue has not already been reported.
1111

1212
- [ ] I have confirmed this bug exists on the latest version of {{
13-
cookiecutter.project_slug }}.
13+
cookiecutter.project_name }}.
1414

1515
- [ ] (optional) I have confirmed this bug exists on the `main` branch of {{
16-
cookiecutter.project_slug }}.
16+
cookiecutter.project_name }}.
1717

1818
---
1919

‎{{cookiecutter.project_slug}}/.github/ISSUE_TEMPLATE/documentation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
name: Documentation Improvement
4-
about: Report wrong or missing documentation
4+
about: Report wrong or missing documentation in {{ cookiecutter.project_name }}
55
title: "DOC:"
66
labels: "documentation"
77

‎{{cookiecutter.project_slug}}/.github/ISSUE_TEMPLATE/enhancement.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
name: Enhancement
4-
about: Suggest an idea for {{ cookiecutter.project_slug }}
4+
about: Suggest an idea for {{ cookiecutter.project_name }}
55
title: "ENH:"
66
labels: "enhancement"
77

@@ -10,7 +10,7 @@ labels: "enhancement"
1010
#### Is your feature request related to a problem?
1111

1212
Provide a description of what the problem is, e.g. "I wish I could use
13-
{{ cookiecutter.project_slug }} to do [...]".
13+
{{ cookiecutter.project_name }} to do [...]".
1414

1515
#### Describe the solution you'd like
1616

‎{{cookiecutter.project_slug}}/.github/ISSUE_TEMPLATE/question.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22

33
name: Submit Question
4-
about: Ask a general question about {{ cookiecutter.project_slug }}
4+
about: Ask a general question about {{ cookiecutter.project_name }}
55
title: "QST:"
66
labels: "question"
77

88
---
99

10-
#### Question about pytask
10+
#### Question about {{ cookiecutter.project_name }}
1111

1212
**Note**: If you'd still like to submit a question, please read [this guide](
1313
https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) detailing how to

‎{{cookiecutter.project_slug}}/.github/workflows/main.yml

+19-16
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ jobs:
3030
python-version: ['3.8', '3.9', '3.10', '3.11']
3131

3232
steps:
33-
- uses: actions/checkout@v2
34-
- uses: conda-incubator/setup-miniconda@v2
33+
- uses: actions/checkout@v3
34+
- uses: mamba-org/provision-with-micromamba@main
3535
with:
36-
auto-update-conda: true
37-
python-version: ${{ matrix.python-version }}
36+
environment-file: false
37+
environment-name: gha-testing
3838
channels: conda-forge,nodefaults
39-
mamba-version: "*"
40-
41-
- name: Install core dependencies.
42-
shell: bash -l {0}
43-
run: mamba install -c conda-forge tox-conda coverage
39+
extra-specs: |
40+
python=${{ matrix.python-version }}
41+
mamba
42+
tox-conda
43+
cache-downloads: true
4444

4545
# Unit, integration, and end-to-end tests.
4646

@@ -78,14 +78,17 @@ jobs:
7878
runs-on: ubuntu-latest
7979

8080
steps:
81-
- uses: actions/checkout@v2
82-
- uses: conda-incubator/setup-miniconda@v2
81+
- uses: actions/checkout@v3
82+
- uses: mamba-org/provision-with-micromamba@main
8383
with:
84-
auto-update-conda: true
85-
86-
- name: Install core dependencies.
87-
shell: bash -l {0}
88-
run: conda install -c conda-forge tox-conda
84+
environment-file: false
85+
environment-name: gha-docs
86+
channels: conda-forge,nodefaults
87+
extra-specs: |
88+
python=3.11
89+
mamba
90+
tox-conda
91+
cache-downloads: true
8992

9093
- name: Build docs
9194
shell: bash -l {0}

‎{{cookiecutter.project_slug}}/setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = {{ cookiecutter.project_slug }}
33
description = {{ cookiecutter.project_description }}
44
long_description = file: README.md
55
long_description_content_type = text/markdown
6-
url = hhttps://github.com/{{ cookiecutter.github_username }}/{{ cookiecutter.project_slug }}
6+
url = https://github.com/{{ cookiecutter.github_username }}/{{ cookiecutter.project_slug }}
77
author = {{ cookiecutter.author }}
88
author_email = {{ cookiecutter.email }}
99
license = {{ cookiecutter.open_source_license }}
@@ -19,7 +19,7 @@ classifiers =
1919
Programming Language :: Python :: 3 :: Only
2020
project_urls =
2121
Changelog = https://github.com/{{ cookiecutter.github_username }}/{{ cookiecutter.project_slug }}
22-
Documentation = hhttps://github.com/{{ cookiecutter.github_username }}/{{ cookiecutter.project_slug }}
22+
Documentation = https://github.com/{{ cookiecutter.github_username }}/{{ cookiecutter.project_slug }}
2323
Github = https://github.com/{{ cookiecutter.github_username }}/{{ cookiecutter.project_slug }}
2424
Tracker = https://github.com/{{ cookiecutter.github_username }}/{{ cookiecutter.project_slug }}/issues
2525

0 commit comments

Comments
 (0)