From ea8df530302847ebd8f801aae5453acbe06a28f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ma=C5=9Blanka?= <piotr.maslanka@henrietta.com.pl>
Date: Tue, 5 Mar 2024 17:05:33 +0100
Subject: [PATCH] move requirements to pyproject.toml
---
.circleci/config.yml | 4 +---
README.md | 6 ++++++
pyproject.toml | 10 ++++------
requirements.txt | 5 -----
satella/__init__.py | 2 +-
5 files changed, 12 insertions(+), 15 deletions(-)
delete mode 100644 requirements.txt
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1fe7f3bb..f7150d79 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,9 +11,7 @@ commands:
steps:
- run:
command: |
- pip install -r requirements.txt
- pip install -U pytest-xdist pytest-cov pytest pytest-forked pluggy py
- pip install .
+ pip install -e .[dev,test,extras]
unit_test:
description: Run the unit tests
steps:
diff --git a/README.md b/README.md
index 2bbb50ed..bf5ef7e0 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,12 @@ is available for the brave souls that do decide to use this library.
See [LICENSE](LICENSE) for text of the license. This library may contain code taken from elsewhere on the internets, so
this is copyright (c) respective authors.
+If you want to install extra modules, just run
+
+```bash
+pip install satella[extras]
+```
+
Running unit tests
------------------
diff --git a/pyproject.toml b/pyproject.toml
index d44d2647..a7cf89b0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,12 +29,10 @@ dependencies = ["psutil"]
version = {attr = "satella.__version__"}
[project.optional-dependencies]
-HTTPJSONSource = ["requests"]
-YAMLSource = ["pyyaml"]
-TOMLSource = ["toml"]
-FasterJSON = ["ujson"]
-cassandra = ["cassandra-driver"]
-opentracing = ["opentracing"]
+dev = ["pylint", "pyyaml", "toml", "requests", "opentracing"]
+test = ["pytest-cov", "pytest-xdist", "pytest", "pytest-forked", "pluggy", "py"]
+extras = ["requests","pyyaml","toml", "ujson", "cassandra-driver", "opentracing"]
+
[build-system]
requires = ["setuptools", "setuptools-scm"]
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index c87e4aa6..00000000
--- a/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-psutil
-pyyaml
-toml
-requests
-opentracing
diff --git a/satella/__init__.py b/satella/__init__.py
index ae6d1c9b..3becaa63 100644
--- a/satella/__init__.py
+++ b/satella/__init__.py
@@ -1 +1 @@
-__version__ = '2.24.3a1'
+__version__ = '2.24.3a2'
--
GitLab