Skip to content

Commit 2c8a92a

Browse files
ChilippChilipp
committed
updated to 1.2.2 and remove MacOS app
1 parent c321e3f commit 2c8a92a

File tree

12 files changed

+61
-200
lines changed

12 files changed

+61
-200
lines changed

‎CHANGELOG.rst

+6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
v1.2.2
22
======
3+
From now one, python 2.7 is not supported anymore.
4+
35
Added
46
-----
57
- Added the possibility to change the central widget of the GUI
68
- Added `remove_plugin` method for psyplot GUI plugins
79

10+
Changed
11+
-------
12+
- removed MacOS app folder in python dist
13+
814
v1.2.1
915
======
1016
monkey patch for ipykernel < 5.1.1 to fix

‎MANIFEST.in

-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,3 @@ include psyplot_gui/sphinx_supp/_static/*
44
include psyplot_gui/sphinx_supp/conf.py
55
include psyplot_gui/sphinx_supp/psyplot.rst
66
include psyplot_gui/icons/*.png
7-
include psyplot_gui/app/*
8-
include psyplot_gui/app/Psyplot.app/*
9-
include psyplot_gui/app/Psyplot.app/Contents/*
10-
include psyplot_gui/app/Psyplot.app/Contents/Resources/*
11-
include psyplot_gui/app/Psyplot.app/Contents/MacOS/*

‎ci/conda-recipe/bld.bat

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
rd /s /q psyplot_gui\app\Psyplot.app
2-
3-
%PYTHON% setup.py install --single-version-externally-managed --record record.txt
4-
if errorlevel 1 exit 1
5-
6-
set MENU_DIR=%PREFIX%\Menu
7-
IF NOT EXIST (%MENU_DIR%) mkdir %MENU_DIR%
8-
9-
copy %RECIPE_DIR%\psyplot.ico %MENU_DIR%\psyplot.ico
10-
if errorlevel 1 exit 1
11-
12-
copy %RECIPE_DIR%\menu-windows.json %MENU_DIR%\psyplot_shortcut.json
13-
if errorlevel 1 exit 1
1+
%PYTHON% -m pip install . --no-deps --ignore-installed -vvv
2+
if errorlevel 1 exit 1
3+
4+
set MENU_DIR=%PREFIX%\Menu
5+
IF NOT EXIST (%MENU_DIR%) mkdir %MENU_DIR%
6+
7+
copy %RECIPE_DIR%\psyplot.ico %MENU_DIR%\psyplot.ico
8+
if errorlevel 1 exit 1
9+
10+
copy %RECIPE_DIR%\menu-windows.json %MENU_DIR%\psyplot_shortcut.json
11+
if errorlevel 1 exit 1

‎ci/conda-recipe/build.sh

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
11
#!/bin/bash
22

3-
$PYTHON setup.py install --single-version-externally-managed --record record.txt
4-
5-
BIN=$PREFIX/bin
6-
7-
if [[ `uname` == Darwin ]]; then
8-
mv psyplot_gui/app/Psyplot.app $PREFIX/psyplotapp
9-
sed -i '' "s/0.01/$PKG_VERSION/" $PREFIX/psyplotapp/Contents/Info.plist
10-
11-
AE=$PREFIX/psyplotapp/Contents/MacOS/run.sh
12-
13-
chmod +x $AE
14-
15-
POST_LINK=$BIN/.psyplot-gui-post-link.sh
16-
PRE_UNLINK=$BIN/.psyplot-gui-pre-unlink.sh
17-
cp $RECIPE_DIR/osx-post.sh $POST_LINK
18-
cp $RECIPE_DIR/osx-pre.sh $PRE_UNLINK
19-
chmod +x $POST_LINK $PRE_UNLINK
20-
21-
else # not Darwin
22-
rm -rf psyplot_gui/app/Psyplot.app
23-
fi
3+
$PYTHON -m pip install . --no-deps --ignore-installed -vvv

‎ci/conda-recipe/meta.yaml

+42-28
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,52 @@
1+
{% set name = "psyplot-gui" %}
2+
{% set version = "1.2.2" %}
3+
14
package:
2-
name: psyplot-gui
3-
version: 1.2.2.dev0
4-
app:
5-
entry: psyplot
6-
icon: logo.png
7-
summary: Psyplot visualization software
8-
type: desk
5+
name: {{ name|lower }}
6+
version: {{ version }}
7+
8+
source:
9+
path: ../..
10+
11+
build:
12+
number: 0
13+
914
requirements:
1015
build:
11-
- python
12-
- setuptools
16+
- python
17+
- pip
1318
run:
14-
- python
15-
- psyplot
16-
- qtconsole
17-
- fasteners
18-
- sphinx
19-
- sphinx_rtd_theme
20-
source:
21-
path: ../..
19+
- python
20+
- psyplot
21+
- qtconsole
22+
- fasteners
23+
- sphinx
24+
- sphinx_rtd_theme
25+
2226
test:
27+
commands:
28+
- psyplot --help
2329
imports:
24-
- psyplot_gui
25-
- psyplot_gui.compat
26-
- psyplot_gui.config
27-
- psyplot_gui.sphinx_supp
30+
- psyplot_gui
31+
- psyplot_gui.compat
32+
- psyplot_gui.config
33+
- psyplot_gui.sphinx_supp
34+
35+
app:
36+
entry: psyplot
37+
icon: logo.png
38+
summary: Psyplot visualization software
39+
type: desk
40+
2841
about:
29-
description: 'psyplot is an interactive python visualization framework for
30-
multi-dimensional data. Being easy scriptable, it can also be used through
31-
a graphical user interface.'
32-
dev_url: https://github.com/Chilipp/psyplot-gui
33-
doc_url: http://psyplot.readthedocs.io/projects/psyplot-gui
3442
home: https://github.com/Chilipp/psyplot-gui
35-
license: GNU General Public License v2 (GPLv2)
36-
license_family: GPL2
43+
license: GPL-2.0
44+
license_family: GPL
3745
license_file: LICENSE
3846
summary: Graphical user interface for the psyplot package
47+
48+
description: |
49+
This package provides a graphical user interface to interact with the
50+
psyplot framework.
51+
doc_url: http://psyplot.readthedocs.io/projects/psyplot-gui
52+
dev_url: https://github.com/Chilipp/psyplot-gui

‎ci/conda-recipe/osx-post.sh

-20
This file was deleted.

‎ci/conda-recipe/osx-pre.sh

-26
This file was deleted.

‎psyplot_gui/app/Psyplot.app/Contents/Info.plist

-62
This file was deleted.

‎psyplot_gui/app/Psyplot.app/Contents/MacOS/run.sh

-18
This file was deleted.

‎psyplot_gui/app/Psyplot.app/Contents/Resources/main.icns

-363 KB
Binary file not shown.

‎psyplot_gui/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# version of psyplot-gui
22

3-
__version__ = "1.2.2.dev0"
3+
__version__ = "1.2.2"

‎setup.py

-6
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ def run_tests(self):
6868
osp.join('psyplot_gui', 'sphinx_supp', 'psyplot.rst'),
6969
osp.join('psyplot_gui', 'sphinx_supp', '_static', '*'),
7070
osp.join('psyplot_gui', 'icons', '*.png'),
71-
# mac app files
72-
osp.join('psyplot_gui', 'app', 'Psyplot.app', 'Contents', '*'),
73-
osp.join('psyplot_gui', 'app', 'Psyplot.app', 'Contents',
74-
'Resources', '*'),
75-
osp.join('psyplot_gui', 'app', 'Psyplot.app', 'Contents',
76-
'MacOS', '*'),
7771
]},
7872
include_package_data=True,
7973
tests_require=['pytest'],

0 commit comments

Comments
 (0)