Merge pull request #20 from reecetech/feature/upd-pyproject

Feature/upd pyproject

Author: fransy26

.pylintrc

@@ -5,20 +5,16 @@ persistent=no
 disable=cyclic-import,
         duplicate-code,
         fixme,
-        locally-disabled,
-        locally-enabled,
-        relative-import,
-        star-args,
         too-few-public-methods,
         too-many-instance-attributes,
         raise-missing-from,
+        abstract-method
 
 [REPORTS]
 output-format=colorized
 reports=no
 
 [BASIC]
-bad-functions=
 include-naming-hint=yes
 
 [FORMAT]

Dockerfile.testing

@@ -24,35 +24,36 @@ FROM python:3.10 AS py310
 RUN echo "${PYTHON_VERSION}" > /tmp/py310-latest
 
 ##------------------------------------------------------------------------------
-FROM centos:7 AS base
-
-# EPEL needed for openssl 1.1.x
-RUN yum clean all \
- && yum update -y \
- && yum install -y \
-        epel-release \
-        nmap-ncat \
-        unixODBC \
- && yum clean all \
- && rm -rf /var/yum/cache
+FROM rockylinux:9 AS base
+
+RUN dnf makecache \
+ && dnf update -y \
+ && dnf install -y --allowerasing \
+        curl \
+        dnf-plugins-core \
+ && dnf config-manager --set-enabled crb \
+ && dnf install -y \
+        bzip2-devel \
+        findutils \
+        gcc \
+        gcc-c++ \
+        git \
+        libffi-devel \
+        make \
+        openssl-devel \
+        python-devel \
+        python3-pip \
+        wget \
+        xz \
+        zlib-devel \
+        sqlite-devel \
+        unixODBC-devel \
+        nc \
+ && dnf clean all
 
 ##------------------------------------------------------------------------------
 FROM base AS builder-base
 
-RUN yum install -y \
-        make \
-        yum-utils
-
-RUN yum-builddep -y python3
-
-# For pyodbc
-RUN yum install -y \
-        unixODBC-devel
-
-# Python >= 3.10 needs openssl 1.1.x
-RUN yum install -y \
-        openssl11-devel
-
 RUN mkdir /usr/local/openssl11 \
  && cd /usr/local/openssl11 \
  && ln -s /usr/lib64/openssl11 lib \
@@ -77,8 +78,8 @@ RUN export PYTHON_VERSION="$(cat /tmp/py${py_ver}-latest)" \
 
 RUN export PYTHON_VERSION="$(cat /tmp/py${py_ver}-latest)" \
  && cd "/tmp/Python-${PYTHON_VERSION}" \
- && ./configure --prefix=/opt/py${py_ver} --with-openssl=/usr/local/openssl11 \
- && make install
+ && ./configure --prefix=/opt/py${py_ver}  --enable-optimizations \
+ && make -j 4 altinstall
 
 USER root
 ENV PATH=/opt/py${py_ver}/bin:"${PATH}"
@@ -110,8 +111,8 @@ RUN export PYTHON_VERSION="$(cat /tmp/py${py_ver}-latest)" \
 
 RUN export PYTHON_VERSION="$(cat /tmp/py${py_ver}-latest)" \
  && cd "/tmp/Python-${PYTHON_VERSION}" \
- && ./configure --prefix=/opt/py${py_ver} --with-openssl=/usr/local/openssl11 \
- && make install
+ && ./configure --prefix=/opt/py${py_ver}  --enable-optimizations \
+ && make -j 4 altinstall
 
 USER root
 ENV PATH=/opt/py${py_ver}/bin:"${PATH}"
@@ -143,8 +144,8 @@ RUN export PYTHON_VERSION="$(cat /tmp/py${py_ver}-latest)" \
 
 RUN export PYTHON_VERSION="$(cat /tmp/py${py_ver}-latest)" \
  && cd "/tmp/Python-${PYTHON_VERSION}" \
- && ./configure --prefix=/opt/py${py_ver} --with-openssl=/usr/local/openssl11 \
- && make install
+ && ./configure --prefix=/opt/py${py_ver}  --enable-optimizations \
+ && make -j 4 altinstall
 
 USER root
 ENV PATH=/opt/py${py_ver}/bin:"${PATH}"
@@ -176,8 +177,8 @@ RUN export PYTHON_VERSION="$(cat /tmp/py${py_ver}-latest)" \
 
 RUN export PYTHON_VERSION="$(cat /tmp/py${py_ver}-latest)" \
  && cd "/tmp/Python-${PYTHON_VERSION}" \
- && ./configure --prefix=/opt/py${py_ver} --with-openssl=/usr/local/openssl11 \
- && make install
+ && ./configure --prefix=/opt/py${py_ver}  --enable-optimizations \
+ && make -j 4 altinstall
 
 USER root
 ENV PATH=/opt/py${py_ver}/bin:"${PATH}"

pyproject.toml

@@ -28,6 +28,18 @@ classifiers=[
 
 dynamic = ["version", "readme"]
 
+dependencies = [
+    "django >= 3.2.0, < 5",
+    "django_informixdb ~= 1.11.4",
+    "hvac ~= 0.10.4",
+    "pyodbc >= 4.0.0, < 5"
+]
+
+[optional-dependencies]
+dev = ['check-manifest']
+all =['%(test)s']
+test = ['coverage']
+
 [[project.authors]]
 name = "Reecetech"
 email = "opensource@reecetech.com.au"
@@ -42,3 +54,6 @@ text = "APLv2"
 [tool.setuptools.dynamic]
 version = {attr = "django_informixdb_vault.VERSION"}
 readme = {file = "README.rst"}
+
+[tool.distutils.bdist_wheel]
+universal = true

setup.cfg

@@ -1,22 +1,3 @@
-[options]
-packages = find:
-install_requires =
-    django >= 3.2.0, < 5
-    django_informixdb ~= 1.11.3
-    hvac ~= 0.10.4
-    pyodbc ~= 4.0.21
-
-[options.extras_require]
-dev =
-    check-manifest
-test =
-    coverage
-all =
-    %(test)s
-
-[bdist_wheel]
-universal=1
-
 [aliases]
 test=pytest