Skip to content

Commit 9d6a2f8

Browse files
committed
Fix Travis-CI rm folder and Windows setup kwargs
1 parent 755edd4 commit 9d6a2f8

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ install:
2323
script:
2424
- python setup.py bdist_wheel
2525
- python setup.py install
26-
- rm -rf ./extrafont
26+
- rm -rf ./tkextrafont
2727
- python -m nose

setup.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ class BuildCommand(build):
4343
def run(self):
4444
build.run(self)
4545

46-
kwargs = {"install_requires": ["scikit-build"], "cmdClass": {"build": BuildCommand}}
46+
47+
kwargs = {
48+
"install_requires": ["scikit-build"], "cmdClass": {"build": BuildCommand},
49+
"package_data": {"tkextrafont": ["extrafont.tcl", "fontnameinfo.tcl", "futmp.tcl", "pkgIndex.tcl"]}
50+
}
4751

4852
elif "win" in sys.platform:
4953
import os
@@ -160,22 +164,23 @@ def copy_to_target(self, target: str):
160164
except shutil.SameFileError:
161165
continue
162166

167+
163168
specials = {}
164169
DependencyWalker("libextrafont.dll", specials=specials).copy_to_target("tkextrafont")
165-
kwargs = {"package_data": {"extrafont": ["*.dll", "pkgIndex.tcl", "extrafont.tcl"] + ["{}/{}".format(dir.strip("/"), base) for base, dir in specials.items()]}}
170+
kwargs = {"package_data": {
171+
"extrafont": ["*.dll", "pkgIndex.tcl", "extrafont.tcl", "fontnameinfo.tcl", "futmp.tcl"] + [
172+
"{}/{}".format(dir.strip("/"), base) for base, dir in specials.items()]}}
166173

167174
else:
168175
printf("Only Linux and Windows are currently supported by the build system")
169176
printf("If you wish to help design a build method for your OS, please")
170177
printf("contact the project author.")
171178
raise RuntimeError("Unsupported platform")
172179

173-
174180
setup(
175181
name="tkextrafont",
176182
version="v0.6.0",
177183
packages=["tkextrafont"],
178-
package_data={"tkextrafont": ["extrafont.tcl", "fontnameinfo.tcl", "futmp.tcl", "pkgIndex.tcl"]},
179184
description="Fonts loader for Tkinter",
180185
author="The extrafont and tkextrafont authors",
181186
url="https://github.com/TkinterEP/tkextrafont",

0 commit comments

Comments
 (0)