Initial implementation for pyproject.toml

matwey · Sep 6, 2024 · a686131 · a686131
1 parent ecedd76
commit a686131
Show file tree

Hide file tree

Showing 25 changed files with 71 additions and 83 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -9,16 +9,8 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        django-version: [2.2, 3.1, 3.2, 4.0]
-        exclude:
-          - python-version: 3.6
-            django-version: 4.0
-          - python-version: 3.7
-            django-version: 4.0
-        include:
-          - python-version: 2.7
-            django-version: 1.11
+        python-version: ["3.10", "3.11", "3.12"]
+        django-version: ["4.2", "5.0", "5.1"]
 
     steps:
     - uses: actions/checkout@v2
@@ -31,7 +23,7 @@ jobs:
         sudo apt-get install -y librrd-dev
         python -m pip install --upgrade pip
         pip install Django==${{ matrix.django-version }}
-        pip install -r requirements.txt
+        pip install -e ".[dev]"
     - name: Run Tests
       run: |
-        python setup.py test
+        pytest
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.15)
+project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION} LANGUAGES C)
+
+set(CMAKE_C_STANDARD 99)
+
+find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(LIBRRD REQUIRED IMPORTED_TARGET librrd)
+
+python_add_library(rrd MODULE c_src/rrd.c WITH_SOABI)
+target_link_libraries(rrd PRIVATE PkgConfig::LIBRRD)
+set_property(TARGET rrd PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+
+install(TARGETS rrd DESTINATION collectd_rest)
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/rrd.c → c_src/rrd.c b/rrd.c → c_src/rrd.c
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,53 @@
+[build-system]
+requires = ["scikit-build-core>=0.3.3"]
+build-backend = "scikit_build_core.build"
+
+[project]
+name = "django-collectd-rest"
+version = "0.2.4"
+authors = [
+  {name = "Matwey V. Kornilov", email = "matwey.kornilov@gmail.com"},
+]
+description = "A simple Django application to demonstrate RRD plots generated by collectd or any other rrd data"
+readme = "README.md"
+license = {text = "BSD-2-Clause"}
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Environment :: Web Environment",
+  "Framework :: Django",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: BSD License",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python",
+  "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+  "Topic :: Internet :: WWW/HTTP",
+]
+requires-python = ">= 3.7"
+dependencies = [
+  "djangorestframework",
+]
+
+[project.optional-dependencies]
+dev = [
+  "mock",
+  "pytest",
+  "pytest-django",
+]
+
+[project.urls]
+Repository = "https://github.com/matwey/django-collectd-rest.git"
+Issues = "https://github.com/matwey/django-collectd-rest/issues"
+
+[tool.scikit-build]
+cmake.verbose = true
+wheel.packages = ["src/collectd_rest"]
+
+[tool.pytest.ini_options]
+DJANGO_SETTINGS_MODULE = "tests.settings"
+django_find_project = false
+pythonpath = ". src"
+testpaths = [
+    "src/collectd_rest",
+    "tests",
+]
diff --git a/requirements.txt b/requirements.txt
diff --git a/runtests.py b/runtests.py
diff --git a/setup.py b/setup.py
diff --git a/collectd_rest/__init__.py → src/collectd_rest/__init__.py b/collectd_rest/__init__.py → src/collectd_rest/__init__.py
diff --git a/collectd_rest/migrations/0001_initial.py → src/collectd_rest/migrations/0001_initial.py b/collectd_rest/migrations/0001_initial.py → src/collectd_rest/migrations/0001_initial.py
diff --git a/collectd_rest/migrations/0002_slug_name.py → ...ollectd_rest/migrations/0002_slug_name.py b/collectd_rest/migrations/0002_slug_name.py → ...ollectd_rest/migrations/0002_slug_name.py
diff --git a/..._rest/migrations/0003_graphgranularity.py → ..._rest/migrations/0003_graphgranularity.py b/..._rest/migrations/0003_graphgranularity.py → ..._rest/migrations/0003_graphgranularity.py
diff --git a/...ions/0004_protect_graph_on_granularity.py → ...ions/0004_protect_graph_on_granularity.py b/...ions/0004_protect_graph_on_granularity.py → ...ions/0004_protect_graph_on_granularity.py
diff --git a/collectd_rest/migrations/__init__.py → src/collectd_rest/migrations/__init__.py b/collectd_rest/migrations/__init__.py → src/collectd_rest/migrations/__init__.py
diff --git a/collectd_rest/models.py → src/collectd_rest/models.py b/collectd_rest/models.py → src/collectd_rest/models.py
diff --git a/collectd_rest/renderers.py → src/collectd_rest/renderers.py b/collectd_rest/renderers.py → src/collectd_rest/renderers.py
diff --git a/collectd_rest/serializers.py → src/collectd_rest/serializers.py b/collectd_rest/serializers.py → src/collectd_rest/serializers.py
diff --git a/collectd_rest/urls.py → src/collectd_rest/urls.py b/collectd_rest/urls.py → src/collectd_rest/urls.py
diff --git a/collectd_rest/views.py → src/collectd_rest/views.py b/collectd_rest/views.py → src/collectd_rest/views.py
diff --git a/tests/test_settings.py → tests/settings.py b/tests/test_settings.py → tests/settings.py
diff --git a/tests/test_all.py b/tests/test_all.py
diff --git a/tests/granularity.py → tests/test_granularity.py b/tests/granularity.py → tests/test_granularity.py
diff --git a/tests/graph.py → tests/test_graph.py b/tests/graph.py → tests/test_graph.py
diff --git a/tests/group.py → tests/test_group.py b/tests/group.py → tests/test_group.py
diff --git a/tests/rrd.py → tests/test_rrd.py b/tests/rrd.py → tests/test_rrd.py