Skip to content

Commit 846c9f3

Browse files
authored
Run all cookie tests and fix check for sdist tarball (#118)
* try running all of the tests? * fix path * add lower() * Revert "add lower()" This reverts commit 305775f. * ls all * add back lower() and replace hyphen with underscore * remove diagnostic ls * update changelog
1 parent 11fdc10 commit 846c9f3

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

.github/actions/run-cookie-ci/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ runs:
5959
docker images
6060
sed -i -e 's/fail_ci_if_error: true/fail_ci_if_error: false/g' .github/workflows/gh-ci.yaml
6161
cat .github/workflows/gh-ci.yaml
62-
act --job main-tests --platform ubuntu-latest=act-conda -s CODECOV_TOKEN=${{ inputs.CODECOV_TOKEN }} -p=false
62+
act --platform ubuntu-latest=act-conda -s CODECOV_TOKEN=${{ inputs.CODECOV_TOKEN }} -p=false

.github/workflows/gh-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ defaults:
1919
env:
2020
ARTIFACT_NAME: demo-mdakit-repos
2121
OUTPUT_DIRECTORY: /home/runner/example_outputs
22-
OUTPUT_COOKIE_SUBDIRECTORY: TestMDAKit_with_host_MDAnalysis_condaforge-deps_and_ReadTheDocs/mdakit-cookie
22+
OUTPUT_COOKIE_SUBDIRECTORY: TestMDAKit_with_host_MDAnalysis_condaforge-deps_and_ReadTheDocs/mdakit-Cookie
2323
GH_USER: github-actions
2424
GH_EMAIL: "github-action@users.noreply.github.com"
2525
GH_REPOSITORY: "github.com/${{ github.repository }}.git"

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ The rules for this file:
3030

3131
### Added
3232
<!-- New added features -->
33-
- Fixed ModuleNotFound after installation (Issue #113, PR #115)
3433
- Add black configurartion to `pyproject.toml` (Issue #73, PR #75)
3534
- Cookiecutter version dependency (Issue #33, PR #46)
3635
- Configuration files for external hooks (PR #9)
@@ -43,6 +42,8 @@ The rules for this file:
4342

4443
### Fixed
4544
<!-- Bug fixes -->
45+
- Fixed pypi_check with lowercase (PR #118, Issue #112)
46+
- Fixed ModuleNotFound after installation (Issue #113, PR #115)
4647
- Fix cookie pypi_check test (PR #45)
4748
- Bump minimum Python version to 3.9 in line with CI build matrix (#70)
4849
- Propagate `**kwargs` to `AnalysisBase` (PR #66)

tests/test_output.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def test_write_outputs(
5858
output_directory.mkdir(exist_ok=True)
5959
kitter = CookiecutterMDAKit(
6060
project_name=project_name,
61-
repo_name="mdakit-cookie",
62-
package_name="cookiekit",
61+
repo_name="mdakit-Cookie",
62+
package_name="cookieKit",
6363
github_username="test-user-account",
6464
github_host_account=github_host_account,
6565
description=description,

{{cookiecutter.repo_name}}/.github/workflows/{{cookiecutter._ci_name}}.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
172172
- name: Check package build
173173
run: |
174-
DISTRIBUTION=$(ls -t1 dist/{{ cookiecutter.repo_name }}-*.tar.gz | head -n 1)
174+
DISTRIBUTION=$(ls -t1 dist/{{ cookiecutter.repo_name.lower().replace('-', '_') }}-*.tar.gz | head -n 1)
175175
test -n "${DISTRIBUTION}" || { echo "no distribution dist/{{ cookiecutter.repo_name }}-*.tar.gz found"; exit 1; }
176176
echo "twine check $DISTRIBUTION"
177177
twine check $DISTRIBUTION

0 commit comments

Comments
 (0)