Merge pull request #40 from reecetech/feature/upd-pyproject-for-compl…

…iance-and-upd-docker-tests

update pyproject for compliance and update docker unit tests to use R…

Dockerfile.testing

@@ -24,34 +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 \
@@ -77,8 +79,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 +112,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 +145,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 +178,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}"

README.rst

@@ -307,6 +307,10 @@ Requirements: Docker 19.03.2 or newer and Docker Compose 1.24.1 or newer.
 Release History
 ---------------
 
+Version 1.11.4
+
+- Update pyproject.toml / setup.cfg and update docker tests to use Rocky9 instead of Centos7
+
 Version 1.11.3
 
 - Switch from setup.py to pyproject.toml / setup.cfg

pyproject.toml

@@ -27,6 +27,16 @@ classifiers=[
 
 dynamic = ["version", "readme"]
 
+dependencies = [
+    "django >= 3.2.0, < 5",
+    "pyodbc >= 4.0.0, < 5"
+]
+
+[optional-dependencies]
+dev = ['check-manifest']
+all =['%(test)s']
+test = ['coverage']
+
 [[project.authors]]
 name = "Reecetech"
 email = "[email protected]"
@@ -41,3 +51,6 @@ text = "APLv2"
 [tool.setuptools.dynamic]
 version = {attr = "django_informixdb.VERSION"}
 readme = {file = "README.rst"}
+
+[tool.distutils.bdist_wheel]
+universal = true

setup.cfg

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

test/test_base.py

@@ -31,6 +31,7 @@ def db_config():
         "OPTIONS": {},
         "AUTOCOMMIT": True,
         "CONN_MAX_AGE": None,
+        "CONN_HEALTH_CHECKS": False,
         "TIME_ZONE": None,
     }
 

tox.ini

@@ -8,6 +8,7 @@ deps =
     pytest-django
     pytest-mock
     freezegun
+    pyodbc<5
 
     dj3: Django>=3.2.0,<4
     dj4: Django>=4,<5