[yt-svn] commit/yt: 2 new changesets

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Wed Oct 26 17:51:30 PDT 2016


2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/732bbecb894e/
Changeset:   732bbecb894e
Branch:      stable
User:        ngoldbaum
Date:        2016-10-26 19:37:43+00:00
Summary:     Gather data files to install using include_package_data=True

This requires adding empty __init__.py files to directories where we store
data. See http://stackoverflow.com/a/13315109/1382869 for an explanation for
why this is the case.
Affected #:  5 files

diff -r 472c5babbc8c178f1236284ee5a309fc89fea250 -r 732bbecb894e4e9c8d2d8d0a5f10810acab72d85 setup.py
--- a/setup.py
+++ b/setup.py
@@ -32,24 +32,6 @@
 except pkg_resources.DistributionNotFound:
     pass  # yay!
 
-MAPSERVER_FILES = []
-MAPSERVER_DIRS = [
-    "",
-    "leaflet",
-    "leaflet/images"
-]
-
-for subdir in MAPSERVER_DIRS:
-    dir_name = os.path.join("yt", "visualization", "mapserver", "html", subdir)
-    files = []
-    for ext in ["js", "html", "css", "png", "ico", "gif"]:
-        files += glob.glob("%s/*.%s" % (dir_name, ext))
-    MAPSERVER_FILES.append((dir_name, files))
-
-SHADERS_DIR = os.path.join("yt", "visualization", "volume_rendering", "shaders")
-SHADERS_FILES = glob.glob(os.path.join(SHADERS_DIR, "*.vertexshader")) + \
-    glob.glob(os.path.join(SHADERS_DIR, "*.fragmentshader"))
-
 VERSION = "3.3.2"
 
 if os.path.exists('MANIFEST'):
@@ -369,7 +351,7 @@
     ]
     },
     packages=find_packages(),
-    package_data = {'':['*.pxd']},
+    include_package_data = True,
     setup_requires=[
         'numpy',
         'cython>=0.24',
@@ -389,7 +371,6 @@
     license="BSD",
     zip_safe=False,
     scripts=["scripts/iyt"],
-    data_files=MAPSERVER_FILES + [(SHADERS_DIR, SHADERS_FILES)],
     ext_modules=cython_extensions + extensions,
 )
 


https://bitbucket.org/yt_analysis/yt/commits/93abddc95841/
Changeset:   93abddc95841
Branch:      stable
User:        ngoldbaum
Date:        2016-10-27 00:29:02+00:00
Summary:     Added tag yt-3.3.2 for changeset 732bbecb894e
Affected #:  1 file

diff -r 732bbecb894e4e9c8d2d8d0a5f10810acab72d85 -r 93abddc95841084a2d64c533d90961881fa428fb .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -5196,3 +5196,5 @@
 7edbfde96c3d55b227194394f46c0b2e6ed2b961 yt-3.3.0
 9bc3d0e9b750c923d44d73c447df64fc431f5838 yt-3.3.1
 0d0af4016c88476e134c46ce6c25d9ef88c84614 yt-3.3.2
+732bbecb894e4e9c8d2d8d0a5f10810acab72d85 yt-3.3.2
+732bbecb894e4e9c8d2d8d0a5f10810acab72d85 yt-3.3.2

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.



More information about the yt-svn mailing list