Merge pull request #11 from FLEXible-FL/flexnlp-add-flexible-dependen…

…cies

Add flexible-fl as package dependency

.trunk/.gitignore

@@ -0,0 +1,9 @@
+*out
+*logs
+*actions
+*notifications
+*tools
+plugins
+user_trunk.yaml
+user.yaml
+tmp

.trunk/configs/.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile=black

.trunk/configs/.markdownlint.yaml

@@ -0,0 +1,10 @@
+# Autoformatter friendly markdownlint config (all formatting rules disabled)
+default: true
+blank_lines: false
+bullet: false
+html: false
+indentation: false
+line_length: false
+spaces: false
+url: false
+whitespace: false

.trunk/configs/.yamllint.yaml

@@ -0,0 +1,7 @@
+rules:
+  quoted-strings:
+    required: only-when-needed
+    extra-allowed: ["{|}"]
+  key-duplicates: {}
+  octal-values:
+    forbid-implicit-octal: true

.trunk/configs/ruff.toml

@@ -0,0 +1,5 @@
+# Generic, formatter-friendly config.
+select = ["B", "D3", "E", "F"]
+
+# Never enforce `E501` (line length violations). This should be handled by formatters.
+ignore = ["E501"]

.trunk/trunk.yaml

@@ -0,0 +1,37 @@
+# This file controls the behavior of Trunk: https://docs.trunk.io/cli
+# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
+version: 0.1
+cli:
+  version: 1.21.0
+# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
+plugins:
+  sources:
+    - id: trunk
+      ref: v1.4.4
+      uri: https://github.com/trunk-io/plugins
+# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
+runtimes:
+  enabled:
+    - node@18.12.1
+    - python@3.10.8
+# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
+lint:
+  enabled:
+    - actionlint@1.6.27
+    - bandit@1.7.8
+    - black@24.2.0
+    - checkov@3.2.36
+    - git-diff-check
+    - isort@5.13.2
+    - markdownlint@0.39.0
+    - prettier@3.2.5
+    - ruff@0.3.2
+    - trivy@0.49.1
+    - trufflehog@3.69.0
+    - yamllint@1.35.1
+actions:
+  enabled:
+    - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
+    - trunk-upgrade-available

setup.py

@@ -14,51 +14,54 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
-from setuptools import find_packages, setup
 
+from setuptools import find_packages, setup
 
-PT_requires = ["torch", 
-                "torchvision", 
-                "torchtext", 
-                "torchdata",
-                "portalocker",
-        ]
+PT_requires = [
+    "torch",
+    "torchvision",
+    "torchtext",
+    "torchdata",
+    "portalocker",
+]
 
 setup(
-        name="flexnlp",
-        version="0.0.1",
-        author="Cristina Zuheros-Montes and Argente-Garrido Alberto",
-        long_description=open("README.md", "r", encoding="utf-8").read(),
-        long_description_content_type="text/markdown",
-        keywords="FL federated-learning flexible NLP",
-        url="https://github.com/FLEXible-FL/flex-nlp",
-        packages=find_packages(),
-        install_requires=["numpy",
-                        "multiprocess",
-                        "scikit-learn",
-                        "cardinality",
-                        "sultan",
-                        "tqdm",
-                        "scipy",
-                        "gdown",
-                        # "flexible",
-                        "torch",
-                        "torchtext",
-                        "portalocker",
-                        "torchdata",
-                        "datasets",
-                        "transformers",
-                        "sentence_transformers",
-                        "sentencepiece",
-                        ],
-        extras_require={
-                "pytorch": PT_requires,
-                "develop": ["pytest",
-                        "pytest-cov",
-                        "pytest-xdist",
-                        "coverage",
-                        "jinja2",
-                        ],
-        },
-        python_requires=">=3.8.10",
+    name="flexnlp",
+    version="0.1.0",
+    author="Cristina Zuheros-Montes and Argente-Garrido Alberto",
+    long_description=open("README.md", "r", encoding="utf-8").read(),
+    long_description_content_type="text/markdown",
+    keywords="FL federated-learning flexible NLP",
+    url="https://github.com/FLEXible-FL/flex-nlp",
+    packages=find_packages(),
+    install_requires=[
+        "numpy",
+        "multiprocess",
+        "scikit-learn",
+        "cardinality",
+        "sultan",
+        "tqdm",
+        "scipy",
+        "gdown",
+        "flexible-fl",
+        "torch",
+        "torchtext",
+        "portalocker",
+        "torchdata",
+        "datasets",
+        "transformers",
+        "sentence_transformers",
+        "sentencepiece",
+    ],
+    extras_require={
+        "pytorch": PT_requires,
+        "develop": [
+            "pytest",
+            "pytest-cov",
+            "pytest-xdist",
+            "coverage",
+            "jinja2",
+        ],
+    },
+    python_requires=">=3.8.10",
 )