Skip to content

Commit

Permalink
Merge pull request #175 from ReimarBauer/v9.0.0
Browse files Browse the repository at this point in the history
V9.0.0
  • Loading branch information
ReimarBauer authored May 22, 2024
2 parents 5aef1a4 + 738ea14 commit acc8f54
Show file tree
Hide file tree
Showing 22 changed files with 122 additions and 189 deletions.
8 changes: 2 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml

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

14 changes: 4 additions & 10 deletions .azure-pipelines/azure-pipelines-osx.yml

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

7 changes: 2 additions & 5 deletions .azure-pipelines/azure-pipelines-win.yml

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

Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.11.* *_cpython
target_platform:
- linux-64
16 changes: 0 additions & 16 deletions .ci_support/linux_64_python3.9.____cpython.yaml

This file was deleted.

4 changes: 3 additions & 1 deletion .ci_support/osx_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -11,6 +13,6 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.11.* *_cpython
target_platform:
- osx-64
16 changes: 0 additions & 16 deletions .ci_support/osx_64_python3.9.____cpython.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -11,6 +13,6 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.11.* *_cpython
target_platform:
- osx-arm64
16 changes: 0 additions & 16 deletions .ci_support/osx_arm64_python3.9.____cpython.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.11.* *_cpython
target_platform:
- win-64
12 changes: 0 additions & 12 deletions .ci_support/win_64_python3.9.____cpython.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .gitattributes

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

44 changes: 8 additions & 36 deletions README.md

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

12 changes: 5 additions & 7 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
set MENU_DIR=%PREFIX%\Menu
if not exist %MENU_DIR% mkdir %MENU_DIR%
if errorlevel 1 exit 1
copy %SRC_DIR%\Menu\msui_shortcut.json %MENU_DIR%\msui_shortcut.json
if errorlevel 1 exit 1
copy %SRC_DIR%\Menu\mss.ico %MENU_DIR%\mss.ico
if errorlevel 1 exit 1
mkdir "%PREFIX%\Menu"
copy /Y "%RECIPE_DIR%\menu.json" "%PREFIX%\Menu\%PKG_NAME%_menu.json"
copy /Y "%RECIPE_DIR%\msui.ico" "%PREFIX%\Menu\msui.ico"

; conda-build issue 5311, currently we can't build for windows with pip install
%PYTHON% setup.py install --single-version-externally-managed --record record.txt
if errorlevel 1 exit 1
7 changes: 7 additions & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh

mkdir -p "${PREFIX}/Menu"
cp "${RECIPE_DIR}/menu.json" "${PREFIX}/Menu/${PKG_NAME}_menu.json"
cp "${RECIPE_DIR}/msui.png" "${PREFIX}/Menu/msui.png"

"${PYTHON}" -m pip install . --no-deps -vv
54 changes: 54 additions & 0 deletions recipe/menu.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"$schema": "https://json-schema.org/draft-07/schema",
"$id": "https://schemas.conda.io/menuinst-1.schema.json",
"menu_name": "Mission Support System",
"menu_items": [
{
"name": "MSUI ({{ ENV_NAME }})",
"description": "Mission Support System MSUI",
"activate": true,
"icon": "{{ MENU_DIR }}/msui.{{ ICON_EXT }}",
"command": [
"{{ PYTHON }}",
"{{ PREFIX }}/bin/msui"
],
"platforms": {
"win": {
"command": [
"{{ PYTHON }}",
"{{ SCRIPTS_DIR }}/msui-script.py"
],
"file_extensions": [".menuinst"]
},
"linux": {
"Categories": ["Internet", "Science"],
"Keywords": ["documentation", "information"],
"StartupNotify": true,
"MimeType": ["application/x-menuinst"],
"glob_patterns": {
"application/x-menuinst": "*.menuinst"
}
},
"osx": {
"CFBundleDocumentTypes": [
{
"CFBundleTypeName": "org.conda.menuinst.msui",
"CFBundleTypeRole": "Viewer",
"LSItemContentTypes": ["org.conda.menuinst.main-file-uti"],
"LSHandlerRank": "Default"
}
],
"UTExportedTypeDeclarations": [
{
"UTTypeConformsTo": ["public.data", "public.content"],
"UTTypeIdentifier": "org.conda.menuinst.main-file-uti",
"UTTypeTagSpecification": {
"public.filename-extension": ["menuinst"]
}
}
]
}
}
}
]
}
Loading

0 comments on commit acc8f54

Please sign in to comment.