Skip to content

Commit

Permalink
Merge pull request #13 from yoyonel/core/upgrade_packages
Browse files Browse the repository at this point in the history
Core/upgrade packages
  • Loading branch information
yoyonel authored Aug 20, 2024
2 parents 56b30a0 + 4ccc808 commit ffa0f5c
Show file tree
Hide file tree
Showing 9 changed files with 145 additions and 88 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Get version from tag
id: tag_name
run: |
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Set up Python 3.7
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: 3.7
- name: Install pep517
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Fail if .rej files exist as structure update was not successful
Expand Down Expand Up @@ -57,11 +57,11 @@ jobs:
platform: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.9, '3.10', 3.11, 3.12]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
autoUpdateProject:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.8.5

Expand Down
6 changes: 3 additions & 3 deletions cruft_helloworld/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ def cli(log_level, verbose, show_banner):
type=click.Choice(
[e_global_emoji.name for e_global_emoji in GlobeEmoji], case_sensitive=False
),
callback=lambda ctx, param, value: getattr(GlobeEmoji, value).value
if value
else None,
callback=lambda ctx, param, value: (
getattr(GlobeEmoji, value).value if value else None
),
)
def hello_world(globe_emoji: Optional[str]):
globe_emoji = globe_emoji or find_globe_emoji_from_external_ip()
Expand Down
1 change: 1 addition & 0 deletions cruft_helloworld/tools/click_default_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def bar():
bar
"""

# patched version from fix at: https://github.com/click-contrib/click-default-group/pull/23/files
import warnings

Expand Down
8 changes: 5 additions & 3 deletions cruft_helloworld/tools/dict_nested_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ def nested_update(dict_1: Dict, dict_2: Union[Dict, Mapping]):
return {
**dict_1,
**{
k: nested_update(dict_1.get(k, type(v)()), v)
if isinstance(v, collections.abc.Mapping)
else v
k: (
nested_update(dict_1.get(k, type(v)()), v)
if isinstance(v, collections.abc.Mapping)
else v
)
for k, v in dict_2.items()
},
}
181 changes: 118 additions & 63 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ffa0f5c

Please sign in to comment.