Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare 2.1.2 #243

Merged
merged 4 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
email: jaimergp@users.noreply.github.com
aliases:
- jaimergp
num_commits: 35
num_commits: 37
first_commit: 2022-08-17 17:00:32
github: jaimergp
- name: Trent Nelson
Expand Down Expand Up @@ -87,7 +87,7 @@
aliases:
- Conda Bot
- conda bot
num_commits: 30
num_commits: 33
first_commit: 2022-01-25 22:53:19
github: conda-bot
- name: Aaron Meurer
Expand All @@ -112,7 +112,7 @@
github: isuruf
- name: pre-commit-ci[bot]
email: 66853113+pre-commit-ci[bot]@users.noreply.github.com
num_commits: 7
num_commits: 9
first_commit: 2023-08-21 19:22:51
github: pre-commit-ci[bot]
- name: Martin Chilvers
Expand Down Expand Up @@ -163,7 +163,7 @@
github: katietz
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
num_commits: 6
num_commits: 11
first_commit: 2024-05-06 08:12:56
github: dependabot[bot]
- name: JTignor-Raltron
Expand All @@ -173,6 +173,10 @@
github: JTignor-Raltron
- name: Marco Esters
email: mesters@anaconda.com
num_commits: 11
num_commits: 13
first_commit: 2024-01-26 08:11:25
github: marcoesters
- name: Klaus Zimmermann
email: klaus.zimmermann@quansight.com
num_commits: 1
first_commit: 2024-06-11 12:01:54
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Jason McCampbell <jmccampbell@enthought.com>
Kai Tietz <ktietz@anaconda.com>
Kale Franz <kfranz@continuum.io> Kale Franz <kalefranz@users.noreply.github.com>
Ken Odegard <kodegard@anaconda.com>
Klaus Zimmermann <klaus.zimmermann@quansight.com>
Marco Esters <mesters@anaconda.com>
Mark Wiebe <mwwiebe@gmail.com>
Martin Chilvers <martin.chilvers@gmail.com>
Expand Down
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Authors are sorted alphabetically.
* Kai Tietz
* Kale Franz
* Ken Odegard
* Klaus Zimmermann
* Marco Esters
* Mark Wiebe
* Martin Chilvers
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
[//]: # (current developments)

## 2.1.2 (2024-08-07)

### Bug fixes

* Display shortcut name in Windows' "Open with" menu entries. (#225)
* Fix default MIME type registration on Linux. (#226 via #227)
* Add setuptools to recipe host requirements. (#237)

### Contributors

* @jaimergp
* @marcoesters
* @zklaus



## 2.1.1 (2024-06-07)

### Bug fixes
Expand Down
4 changes: 2 additions & 2 deletions menuinst/_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class Linux(BasePlatformSpecific):
Linux-specific instructions.
Check the `Desktop entry specification
<https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#recognized-keys>`__
<https://specifications.freedesktop.org/desktop-entry-spec/latest/recognized-keys.html>`__
for more details.
"""

Expand All @@ -141,7 +141,7 @@ class Linux(BasePlatformSpecific):
Implements: Optional[Union[List[str], constr(regex=r"^.+;$")]] = None
"""
List of supported interfaces. See 'Interfaces' in `Desktop Entry Spec
<https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#interfaces>`__.
<https://specifications.freedesktop.org/desktop-entry-spec/latest/interfaces.html>`__.
"""
Keywords: Optional[Union[List[str], constr(regex=r"^.+;$")]] = None
"Additional terms to describe this shortcut to aid in searching."
Expand Down
2 changes: 1 addition & 1 deletion menuinst/data/menuinst.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"Linux": {
"title": "Linux",
"description": "Linux-specific instructions.\n\nCheck the `Desktop entry specification\n<https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#recognized-keys>`__\nfor more details.",
"description": "Linux-specific instructions.\n\nCheck the `Desktop entry specification\n<https://specifications.freedesktop.org/desktop-entry-spec/latest/recognized-keys.html>`__\nfor more details.",
"type": "object",
"properties": {
"name": {
Expand Down
19 changes: 0 additions & 19 deletions news/225-friendly-open-with

This file was deleted.

19 changes: 0 additions & 19 deletions news/227-xdg-mime-default

This file was deleted.

19 changes: 0 additions & 19 deletions news/237-add-setuptools-req

This file was deleted.

Loading