Release 0.7.0 (tf-encrypted#856)

* release candidate: 0.7.0

* add version discovery

* release 0.7.0

* Fix formatting issues

Co-authored-by: zhicong.hzc <zhicong.hzc@alibaba-inc.com>

CHANGELOG.md

@@ -5,11 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+
+## [0.7.0]
 **Fixed**
 
 - Fix a buggy CI workflow that fails to use cache in 'deploy' step (because of a different image from 'build step')
 - Remove skipping conditions in aby3 test
 
+**Added**
+- ABY3 available on pypi
+
+
 ## [0.5.9]
 
 **Added**

docs/source/conf.py

@@ -24,9 +24,9 @@
 author = 'The TF Encrypted Authors'
 
 # The short X.Y version
-version = '0.5.9'
+version = '0.7.0'
 # The full version, including alpha/beta/rc tags
-release = '0.5.9'
+release = '0.7.0'
 
 
 # -- General configuration ---------------------------------------------------

meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: tf-encrypted
-  version: "0.5.9"
+  version: "0.7.0"
 
 source:
   git_url: https://github.com/tf-encrypted/tf-encrypted.git

setup.py

@@ -6,7 +6,7 @@
 
 setuptools.setup(
     name="tf-encrypted",
-    version="0.5.9",
+    version="0.7.0",
     packages=setuptools.find_packages(),
     package_data={'tf_encrypted': [
         'operations/secure_random/*.so',

tf_encrypted/__init__.py

@@ -2,10 +2,13 @@
 from __future__ import absolute_import
 
 import inspect
+import os.path
 from typing import Any
 from typing import Optional
 
 import tensorflow as tf
+from pkg_resources import DistributionNotFound
+from pkg_resources import get_distribution
 
 from . import convert
 from . import keras
@@ -25,6 +28,19 @@
 from .session import set_tfe_events_flag
 from .session import set_tfe_trace_flag
 
+try:
+    _dist = get_distribution("tf_encrypted")
+    # Normalize case for Windows systems
+    dist_loc = os.path.normcase(_dist.location)
+    here = os.path.normcase(__file__)
+    if not here.startswith(os.path.join(dist_loc, "tf_encrypted")):
+        # not installed, but there is another version that *is*
+        raise DistributionNotFound
+except DistributionNotFound:
+    __version__ = "Please install this project with setup.py"
+else:
+    __version__ = _dist.version
+
 __protocol__ = None
 __all_prot_funcs__ = protocol.get_all_funcs()
 

tf_encrypted/protocol/aby3/aby3_test.py

@@ -16,7 +16,6 @@
 
 
 class TestABY3(unittest.TestCase):
-
     def test_add_private_private(self):
         tf.reset_default_graph()