Merge pull request #60 from deel-ai/feat/ci_multiple_tf_versions

CI updates (tox + Github workflows)

.github/workflows/python-linters.yml

@@ -1,19 +1,24 @@
 name: deel-lip linters
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
 
 jobs:
   checks:
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, "3.10"]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/python-publish.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.x'
     - name: Install dependencies

.github/workflows/python-tests.yml

@@ -1,24 +1,37 @@
 name: deel-lip tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+  schedule:
+    - cron: "0 2 * * 0" # Run tests every Sunday at 2am
 
 jobs:
   checks:
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        include:
+          - python-version: 3.7
+            tf-version: 2.3
+          - python-version: 3.9
+            tf-version: 2.7
+          - python-version: "3.10"
+            tf-version: latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install tox
-    - name: Test with tox
-      run: tox -e py$(echo ${{ matrix.python-version }} | tr -d .)
+    - name: Test with tox (Python ${{ matrix.python-version }} - TensorFlow ${{ matrix.tf-version }})
+      run: tox -e py$(echo ${{ matrix.python-version }}-tf${{ matrix.tf-version }} | tr -d .)

CONTRIBUTING.md

@@ -27,18 +27,12 @@ Before opening a pull request, please make sure you check your code and you run
 unit tests:
 
 ```bash
-# Using make:
 $ make test
-
-# Or using directly tox in your development environment:
-$ tox
 ```
 
 This command will:
 - check your code with black PEP-8 formatter and flake8 linter.
-- run `unittest` on the `tests/` folder with Python 3.6, 3.7 and 3.8.
-> Note: If you do not have those 3 interpreters, the tests will only be only performed
-  with your current interpreter.
+- run `unittest` on the `tests/` folder with different Python and TensorFlow versions.
 
 
 ## Submitting your changes

MANIFEST.in

@@ -0,0 +1,2 @@
+include deel/lip/VERSION
+include LICENSE

Makefile

@@ -22,10 +22,16 @@ prepare-dev:
 	. deel_lip_dev_env/bin/activate && pip install -e .[docs]
 
 test:
-	. deel_lip_dev_env/bin/activate && tox
+	. deel_lip_dev_env/bin/activate && tox -e py37-tf23
+	. deel_lip_dev_env/bin/activate && tox -e py39-tf27
+	. deel_lip_dev_env/bin/activate && tox -e py310-tflatest
+	. deel_lip_dev_env/bin/activate && tox -e py310-lint
 
 test-disable-gpu:
-	. deel_lip_dev_env/bin/activate && CUDA_VISIBLE_DEVICES=-1 tox
+	. deel_lip_dev_env/bin/activate && CUDA_VISIBLE_DEVICES=-1 tox -e py37-tf23
+	. deel_lip_dev_env/bin/activate && CUDA_VISIBLE_DEVICES=-1 tox -e py39-tf27
+	. deel_lip_dev_env/bin/activate && CUDA_VISIBLE_DEVICES=-1 tox -e py310-tflatest
+	. deel_lip_dev_env/bin/activate && CUDA_VISIBLE_DEVICES=-1 tox -e py310-lint
 
 doc:
 	. deel_lip_dev_env/bin/activate && cd doc && make html && cd -

deel/lip/VERSION

@@ -0,0 +1 @@
+1.3.0

deel/lip/__init__.py

@@ -2,6 +2,12 @@
 # rights reserved. DEEL is a research program operated by IVADO, IRT Saint Exupéry,
 # CRIAQ and ANITI - https://www.deel.ai/
 # =====================================================================================
+
+from os import path
+
+with open(path.join(path.dirname(__file__), "VERSION")) as f:
+    __version__ = f.read().strip()
+
 from . import activations
 from . import callbacks
 from . import constraints

doc/source/conf.py

@@ -14,7 +14,8 @@
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 # import guzzle_sphinx_theme
-import sphinx_rtd_theme
+# import sphinx_rtd_theme
+from deel.lip import __version__
 
 # -- Project information -----------------------------------------------------
 
@@ -31,7 +32,8 @@
 )
 
 # The full version, including alpha/beta/rc tags
-release = "1.3.0"
+version = __version__
+release = version
 
 # -- General configuration ---------------------------------------------------
 

setup.cfg

@@ -4,18 +4,28 @@ max-line-length = 88
 extend-ignore =
     # See https://github.com/PyCQA/pycodestyle/issues/373
     E203, E231
-per-file-ignores = 
+per-file-ignores =
 	*/__init__.py: F401
 
 [tox:tox]
-envlist = py{36,37,38},py{36,37,38}-lint
+envlist = py{37,38,39,310}-tf{22,23,24,25,26,27,28,29,latest},py{37,38,39,310}-lint
 
 [testenv]
 deps =
+    packaging
+    tf22: protobuf == 3.20.3
+    tf22: tensorflow ~= 2.2.0
+    tf23: tensorflow ~= 2.3.0
+    tf24: tensorflow ~= 2.4.0
+    tf25: tensorflow ~= 2.5.0
+    tf26: tensorflow ~= 2.6.0
+    tf27: tensorflow ~= 2.7.0
+    tf28: tensorflow ~= 2.8.0
+    tf29: tensorflow ~= 2.9.0
 commands =
     python -m unittest
 
-[testenv:py{36,37,38}-lint]
+[testenv:py{37,38,39,310}-lint]
 skip_install = true
 deps =
     black

setup.py

@@ -11,6 +11,9 @@
 with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
+with open(path.join(this_directory, "deel/lip/VERSION")) as f:
+    version = f.read().strip()
+
 dev_requires = [
     "tox",
     "black",
@@ -30,7 +33,7 @@
 
 setuptools.setup(
     name="deel-lip",
-    version="1.3.0",
+    version=version,
     author=", ".join(["Mathieu SERRURIER", "Franck MAMALET", "Thibaut BOISSIN"]),
     author_email=", ".join(
         [
@@ -44,16 +47,18 @@
     long_description_content_type="text/markdown",
     url="https://github.com/deel-ai/deel-lip",
     packages=setuptools.find_namespace_packages(include=["deel.*"]),
-    install_requires=["numpy", "tensorflow>=2,<3"],
+    include_package_data=True,
+    install_requires=["numpy", "tensorflow~=2.2"],
     license="MIT",
     extras_require={"dev": dev_requires, "docs": docs_requires},
     classifiers=[
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    python_requires=">=3.6",
+    python_requires=">=3.7",
 )

tests/test_models.py

@@ -1,6 +1,7 @@
 """These tests assert that deel.lip Sequential and Model objects behave as expected."""
 
 import warnings
+from packaging import version
 from unittest import TestCase
 import numpy as np
 import tensorflow as tf
@@ -98,11 +99,13 @@ def test_warning_unsupported_1Lip_layers(self):
             kl.MaxPool2D(pool_size=3, strides=2),
             kl.Add(),
             kl.Concatenate(),
-            kl.Activation("gelu"),
             kl.Dense(5),
             kl.Conv2D(10, 3),
             kl.UpSampling2D(),
         ]
+        if version.parse(tf.__version__) >= version.parse("2.4.0"):
+            unsupported_layers.append(kl.Activation("gelu"))
+
         for lay in unsupported_layers:
             with self.assertWarnsRegex(
                 Warning,