Fex

Check-in [401afa1988]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Post packaging-test patch-up
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | master
Files: files | file ages | folders
SHA3-256: 401afa1988026bf300f120b063ffa0721186db3a74c10bf7d23d105c549cab6c
User & Date: jmcclure 2017-08-27 00:48:22
Context
2017-08-27
00:59
Added PKGBUILD for archlinux check-in: 4bb722ad3d user: jmcclure tags: trunk, master
00:48
Post packaging-test patch-up check-in: 401afa1988 user: jmcclure tags: trunk, master
2017-08-26
23:51
Converted config to yaml; packaging clean up; nearing beta release check-in: 93665ca85c user: jmcclure tags: trunk, master
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to fexqt/config.py. 

2
3
4
5
6
7
8
9
10
11
12
13
14
15
16

import os, site, tempfile, yaml
from PyQt5.QtCore import Qt
from PyQt5.QtGui import QPalette, QColor

def configure():
	_files = []
	for fname in [ 'icons.yaml', 'actions.yaml', 'menu.yaml', 'config.yaml' ]:
		_files += [os.path.join(p, fname) for p in site.getsitepackages()]
		if 'APPDATA' in os.environ:
			_files += os.path.join(os.environ['APPDATA'], 'fex', fname)
		elif 'XDG_CONFIG_HOME' in os.environ:
			_files += [os.path.join(os.environ['XDG_CONFIG_HOME'], 'fex', fname)]
		elif 'HOME' in os.environ:
			_files += [os.path.join(os.environ['HOME'], '.config', 'fex', fname)]
		_files += [os.path.join(os.getcwd(), 'fexqt',  fname)] # FIXME DELME








|








2
3
4
5
6
7
8
9
10
11
12
13
14
15
16

import os, site, tempfile, yaml
from PyQt5.QtCore import Qt
from PyQt5.QtGui import QPalette, QColor

def configure():
	_files = []
	for fname in [ 'icons.yaml', 'actions.yaml', 'menu.yaml', 'config.yaml' ]:
		_files += [os.path.join(p, 'fexqt', fname) for p in site.getsitepackages()]
		if 'APPDATA' in os.environ:
			_files += os.path.join(os.environ['APPDATA'], 'fex', fname)
		elif 'XDG_CONFIG_HOME' in os.environ:
			_files += [os.path.join(os.environ['XDG_CONFIG_HOME'], 'fex', fname)]
		elif 'HOME' in os.environ:
			_files += [os.path.join(os.environ['HOME'], '.config', 'fex', fname)]
		_files += [os.path.join(os.getcwd(), 'fexqt',  fname)] # FIXME DELME

Changes to setup.py. 

20
21
22
23
24
25
26
27
28
29
30
31

	],
	url='http://jessemcclure.org',
	author='Jesse McClure',
	author_email='jmcclure@broadinstitute.org',
	license='MIT',
	packages=['fexqt'],
	package_data={'fexqt': ['*.yaml']},
	install_requires=['pyaml', 'PyQt5', 'scipy'],
	python_requires='>=3',
	entry_points={'console_scripts': ['fex=fexqt:main']},
	include_package_data=True,
	zip_safe=False)








|





20
21
22
23
24
25
26
27
28
29
30
31

	],
	url='http://jessemcclure.org',
	author='Jesse McClure',
	author_email='jmcclure@broadinstitute.org',
	license='MIT',
	packages=['fexqt'],
	package_data={'fexqt': ['*.yaml']},
	install_requires=['numpy', 'scipy', 'pyYAML' ], # PyQt5 has no pkg on PyPi
	python_requires='>=3',
	entry_points={'console_scripts': ['fex=fexqt:main']},
	include_package_data=True,
	zip_safe=False)