Browse Source

Update __version__.py in make publish

Lutz Roeder 7 years ago
parent
commit
c9a7ca105c
2 changed files with 26 additions and 4 deletions
  1. 2 2
      Makefile
  2. 24 2
      setup.py

+ 2 - 2
Makefile

@@ -13,7 +13,7 @@ clean:
 build_python:
 	@[ -d node_modules ] || npm install
 	rm -rf ./build/python
-	python ./setup.py build
+	python ./setup.py build --version
 
 build_electron:
 	@[ -d node_modules ] || npm install
@@ -36,7 +36,7 @@ publish_github_electron:
 
 publish_github_pages:
 	@[ -d node_modules ] || npm install
-	python ./setup.py build
+	python ./setup.py build --version
 	rm -rf ./build/gh-pages
 	git clone [email protected]:lutzroeder/netron.git ./build/gh-pages --branch gh-pages
 	rm -rf ./build/gh-pages/*

+ 24 - 2
setup.py

@@ -6,6 +6,7 @@ import json
 import os
 import setuptools
 import setuptools.command.build_py
+import distutils.command.build
 
 node_dependencies = [ 
     ( 'netron', [
@@ -37,7 +38,27 @@ node_dependencies = [
         'node_modules/npm-font-open-sans/fonts/Bold/OpenSans-Bold.woff2' ])
 ]
 
+class build(distutils.command.build.build):
+    user_options = distutils.command.build.build.user_options + [ ('version', None, 'lalala' ) ]
+    def initialize_options(self):
+        distutils.command.build.build.initialize_options(self)
+        self.version = None
+    def finalize_options(self):
+        distutils.command.build.build.finalize_options(self)
+    def run(self):
+        if self.version:
+            build_py.version = True;
+        else:
+            build_py.version = False;
+        return distutils.command.build.build.run(self)
+
 class build_py(setuptools.command.build_py.build_py):
+    user_options = setuptools.command.build_py.build_py.user_options + [ ('version', None, 'lalala' ) ]
+    def initialize_options(self):
+        setuptools.command.build_py.build_py.initialize_options(self)
+        self.version = None
+    def finalize_options(self):
+        setuptools.command.build_py.build_py.finalize_options(self)
     def run(self):
         result = setuptools.command.build_py.build_py.run(self)
         for target, files in node_dependencies:
@@ -49,7 +70,7 @@ class build_py(setuptools.command.build_py.build_py):
         return result
     def build_module(self, module, module_file, package):
         setuptools.command.build_py.build_py.build_module(self, module, module_file, package)
-        if module == '__version__':
+        if build_py.version and module == '__version__':
             package = package.split('.')
             outfile = self.get_module_outfile(self.build_lib, package, module)
             with open(outfile, 'w+') as f:
@@ -74,6 +95,7 @@ setuptools.setup(
     ],
     license="MIT",
     cmdclass={
+        'build': build,
         'build_py': build_py
     },
     package_dir={
@@ -85,6 +107,7 @@ setuptools.setup(
     package_data={
         'netron': [ 
             'favicon.ico', 'icon.png',
+            'numpy.js', 'zip.js', 'tar.js', 'gzip.js',
             'onnx.js', 'onnx.js', 'onnx-metadata.json',
             'coreml.js', 'coreml-metadata.json', 'coreml-proto.js',
             'caffe.js', 'caffe-metadata.json', 'caffe-proto.js',
@@ -96,7 +119,6 @@ setuptools.setup(
             'sklearn.js', 'sklearn-metadata.json',
             'tf.js', 'tf-metadata.json', 'tf-proto.js', 
             'tflite.js', 'tflite-metadata.json', 'tflite-schema.js', 
-            'numpy.js', 'zip.js', 'tar.js', 'gzip.js',
             'view-browser.html', 'view-browser.js',
             'view-grapher.css', 'view-grapher.js',
             'view-sidebar.css', 'view-sidebar.js',