1.2.7: Drop OVH support and fix Accelstore.

Accelize · Apr 1, 2019 · e57b59a · e57b59a
1 parent 432b2fa
commit e57b59a
Show file tree

Hide file tree

Showing 27 changed files with 47 additions and 323 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Some reasons to use Apyfal :
 
 Apyfal provides a variety of accelerated functions.
 
-Browse our web site [AccelStore](https://accelstore.accelize.com), to discover them.
+Browse our [distribution platform](https://drmportal.accelize.com/front/customer/listpurchase), to discover them.
 
 ## Basic Python code example
 
@@ -57,7 +57,7 @@ pip install apyfal[all]
 ```
 
 # Support and enhancement requests
-[Contact us](https://www.accelize.com/contact) for any support or enhancement request.
+[Contact us](https://www.accelize.com/contact-us) for any support or enhancement request.
 
 
 # Footnotes

diff --git a/apyfal/__init__.py b/apyfal/__init__.py
@@ -16,7 +16,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-__version__ = "1.2.6"
+__version__ = "1.2.7"
 __copyright__ = "Copyright 2018 Accelize"
 __licence__ = "Apache 2.0"
 __all__ = ['Accelerator', 'AcceleratorPoolExecutor', 'iter_accelerators',
@@ -26,6 +26,10 @@
 if (_py[0] < 2) or (_py[0] == 2 and _py[1] < 7) or (_py[0] == 3 and _py[1] < 4):
     from sys import version
     raise ImportError('Python %s is not supported by Apyfal' % version)
+elif _py[0] == 3 and _py[1] == 4:
+    import warnings
+    warnings.warn(
+        "Next Apyfal version will not support Python 3.4.", DeprecationWarning)
 del _py
 
 from concurrent.futures import ThreadPoolExecutor as _ThreadPoolExecutor, \
@@ -52,19 +56,14 @@ class Accelerator(_AbstractAsyncAccelerator):
     Accelerator and its host.
 
     Args:
-        accelerator (str): Name of the accelerator to initialize,
-            to know the accelerator list please visit
-            "https://accelstore.accelize.com".
+        accelerator (str): Name of the accelerator to initialize.
         config (apyfal.configuration.Configuration, path-like object or file-like object):
             If not set, will search it in current working directory,
             in current user "home" folder. If none found, will use default
             configuration values.
             Path-like object can be path, URL or cloud object URL.
         accelize_client_id (str): Accelize Client ID.
-            Client ID is part of the access key generated on
-            "https:/accelstore.accelize.com/user/applications".
-        accelize_secret_id (str): Accelize Secret ID. Secret ID come with
-            xlz_client_id.
+        accelize_secret_id (str): Accelize Secret ID.
         host_type (str): Type of host to use.
         host_ip (str): IP or URL address of an already existing host to use.
             If not specified, create a new host.

diff --git a/apyfal/_pool_executor.py b/apyfal/_pool_executor.py
@@ -142,19 +142,14 @@ class AcceleratorPoolExecutor(_AbstractAsyncAccelerator):
     Accelerator and its host.
 
     Args:
-        accelerator (str): Name of the accelerator to initialize,
-            to know the accelerator list please visit
-            "https://accelstore.accelize.com".
+        accelerator (str): Name of the accelerator to initialize.
         config (apyfal.configuration.Configuration, path-like object or file-like object):
             If not set, will search it in current working directory,
             in current user "home" folder. If none found, will use default
             configuration values.
             Path-like object can be path, URL or cloud object URL.
         accelize_client_id (str): Accelize Client ID.
-            Client ID is part of the access key generated on
-            "https:/accelstore.accelize.com/user/applications".
-        accelize_secret_id (str): Accelize Secret ID. Secret ID come with
-            xlz_client_id.
+        accelize_secret_id (str): Accelize Secret ID.
         host_type (str): Type of host to use.
         stop_mode (str or int): Host stop mode.
             Default to 'term' if new host, or 'keep' if already existing host.

diff --git a/apyfal/client/__init__.py b/apyfal/client/__init__.py
@@ -22,15 +22,10 @@ class AcceleratorClient(_utl.ABC):
     REST accelerator client.
 
     Args:
-        accelerator (str): Name of the accelerator to initialize,
-            to know the accelerator list please visit
-            "https://accelstore.accelize.com".
+        accelerator (str): Name of the accelerator to initialize.
         client_type (str): Type of client.
         accelize_client_id (str): Accelize Client ID.
-            Client ID is part of the access key generate from
-            "https:/accelstore.accelize.com/user/applications".
-        accelize_secret_id (str): Accelize Secret ID. Secret ID come with
-            client_id.
+        accelize_secret_id (str): Accelize Secret ID.
         config (apyfal.configuration.Configuration, path-like object or file-like object):
             If not set, will search it in current working directory,
             in current user "home" folder. If none found, will use default

diff --git a/apyfal/client/rest.py b/apyfal/client/rest.py
@@ -24,14 +24,9 @@ class RESTClient(_Client):
     Remote Accelerator OpenAPI REST client.
 
     Args:
-        accelerator (str): Name of the accelerator to initialize,
-            to know the accelerator list please visit
-            "https://accelstore.accelize.com".
+        accelerator (str): Name of the accelerator to initialize.
         accelize_client_id (str): Accelize Client ID.
-            Client ID is part of the access key generate from
-            "https:/accelstore.accelize.com/user/applications".
-        accelize_secret_id (str): Accelize Secret ID. Secret ID come with
-            client_id.
+        accelize_secret_id (str): Accelize Secret ID.
         host_ip (str): IP or URL address of the accelerator host.
         ssl_cert_crt (path-like object or file-like object or bool):
             Public ".crt" key file of the SSL ssl_cert_key used by host to

diff --git a/apyfal/client/syscall.py b/apyfal/client/syscall.py
@@ -66,10 +66,7 @@ class SysCallClient(_Client):
 
     Args:
         accelize_client_id (str): Accelize Client ID.
-            Client ID is part of the access key generate from
-            "https:/accelstore.accelize.com/user/applications".
-        accelize_secret_id (str): Accelize Secret ID. Secret ID come with
-            client_id.
+        accelize_secret_id (str): Accelize Secret ID.
         host_type (str): Type of the current host.
         region (str): Region of the current host.
         config (apyfal.configuration.Configuration, path-like object or file-like object):

diff --git a/apyfal/host/ovh.py b/apyfal/host/ovh.py
diff --git a/apyfal/storage/ovh.py b/apyfal/storage/ovh.py
diff --git a/docs/accelerator.conf b/docs/accelerator.conf
@@ -42,7 +42,7 @@
 ;---------------------------
 ;This section sets the account details for the
 ;Accelize server and the access keys created via:
-;https://accelstore.accelize.com/user/applications
+;https://drmportal.accelize.com/front/customer/apicredential
 
 ;Client and Secret ID from Accelize account page.
 
@@ -61,7 +61,7 @@ secret_id =
 
 ;Host type
 ;
-;*Possible values:* ``Alibaba``, ``AWS``, ``OpenStack``, ``OVH``
+;*Possible values:* ``Alibaba``, ``AWS``, ``OpenStack``
 ;
 host_type =
 
@@ -74,19 +74,18 @@ secret_id =
 ;Host region for cloud hosts
 ;A region that supports instances with FPGA devices is required.
 ;
-;*Required only for: Alibaba, AWS, OpenStack, OVH*
+;*Required only for: Alibaba, AWS, OpenStack*
 ;
 ;*Possible values for:*
 ;
 ;- *Alibaba:* ``cn-hangzhou``
 ;- *AWS:* ``eu-west-1``, ``us-east-1``, ``us-west-2``
-;- *OVH:* ``GRA3``
 ;
 region =
 
 ;OpenStack Project ID
 ;
-;*Required only for: OpenStack, OVH*
+;*Required only for: OpenStack*
 ;
 project_id =
 

diff --git a/docs/accelerator_executable.rst b/docs/accelerator_executable.rst
diff --git a/docs/advanced_storage.rst b/docs/advanced_storage.rst
@@ -42,13 +42,6 @@ The bucket name needs to be specified just before the file path in URL.
 See :doc:`api_storage` for information available storage services and the scheme
 to use.
 
-Example:
-
-* ``s3://my_bucket/my_file``: File with ``my_file`` key on AWS S3 ``my_bucket``
-  bucket.
-* ``ovh://my_container/my_file``: File with ``my_file`` name on OVH Object Store
-  ``my_container`` container.
-
 The ``host`` scheme
 ~~~~~~~~~~~~~~~~~~~
 

diff --git a/docs/api_host.rst b/docs/api_host.rst
@@ -11,4 +11,3 @@ apyfal.host
    api_host_alibaba
    api_host_aws
    api_host_openstack
-   api_host_ovh
diff --git a/docs/api_host_ovh.rst b/docs/api_host_ovh.rst
diff --git a/docs/api_storage.rst b/docs/api_storage.rst
@@ -11,4 +11,3 @@ apyfal.storage
    api_storage_alibaba
    api_storage_aws
    api_storage_openstack
-   api_storage_ovh
diff --git a/docs/api_storage_ovh.rst b/docs/api_storage_ovh.rst