Skip to content

Commit 21c80a1

Browse files
REL: move doc and icons folders to meet conda-forge release infrastructure.
1 parent 8b8d2c3 commit 21c80a1

File tree

123 files changed

+8
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+8
-8
lines changed

Diff for: setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# Use this version when git data are not available, like in git zip archive.
1717
# Update when tagging a new release.
18-
FALLBACK_VERSION = '1.4.2'
18+
FALLBACK_VERSION = '1.4.3'
1919

2020
# determine if we run with Python 3.
2121
PY3 = (sys.version_info[0] == 3)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: src/diffpy/pdfgui/gui/pdfguiglobals.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,13 @@
3737

3838
# Requirement must have egg-info. Do not use in _development_mode.
3939
_req = Requirement.parse("diffpy.pdfgui")
40-
APPDATADIR = (os.path.dirname(_upbasedir) if _development_mode
41-
else resource_filename(_req, ""))
40+
# APPDATADIR = (os.path.dirname(_upbasedir) if _development_mode
41+
# else resource_filename(_req, ""))
42+
if _development_mode:
43+
APPDATADIR = os.path.dirname(_upbasedir)
44+
else:
45+
APPDATADIR = os.path.join(resource_filename(_req, ""), "diffpy/pdfgui")
46+
4247
APPDATADIR = os.path.abspath(APPDATADIR)
4348

4449
# Location of the HTML manual
@@ -59,11 +64,6 @@ def iconpath(iconfilename):
5964
Return string.
6065
"""
6166
rv = os.path.join(APPDATADIR, 'icons', iconfilename)
62-
print("APPDATADIR")
63-
print(APPDATADIR)
64-
print("rv")
65-
print(rv)
66-
print(os.path.isfile(rv))
6767
assert os.path.isfile(rv), "icon file does not exist"
6868
return rv
6969

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)