minimize changes

Author: shomchak

Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.12-slim
+FROM python:3.9-slim
 
-LABEL org.opencontainers.image.authors="brian <[email protected]>"
+MAINTAINER brian <[email protected]>
 
-ENV LANG=C.UTF-8
-ENV	LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV	LC_ALL C.UTF-8
 
 # TODO: keep requirements in one place
 RUN pip install \
@@ -29,26 +29,20 @@ RUN pip install \
     pyinotify>=0.9.4, \
     raven>=5.0.0 \
     'tox>4,<5' \
-    # v80 removes many setup.py develop otions
-    'setuptools<80.0.0' \
     'datalake<2'
 
-# RUN pip install -U pip
-
 RUN mkdir -p /opt/
 COPY . /opt/
 
-# RUN pip install -e /opt/client[test]
-
 # Take care to install clients such that the source code can be mounted into
 # the container and used for development. That is, the python paths and paths
 # to console scripts Just Work (TM)
 ENV PYTHONPATH=/opt/client:/opt/ingester:/opt/api
 RUN for d in ingester api; do \
     cd /opt/$d && \
-    python setup.py develop --script-dir /usr/local/bin \
+    python setup.py develop -s /usr/local/bin \
         --egg-path ../../../../../opt/$d/ \
-        -d /usr/local/lib/python3.12/site-packages/ \
+        -d /usr/local/lib/python3.9/site-packages/ \
         --no-deps; \
     done
 

api/setup.py

@@ -30,7 +30,7 @@ def get_version_from_pyver():
         if 'sdist' in sys.argv or 'bdist_wheel' in sys.argv:
             raise ImportError('You must install pyver to create a package')
         else:
-            return '0.dev'
+            return 'noversion'
     version, version_info = pyver.get_version(pkg="datalake_api",
                                               public=True)
     return version

client/datalake/tests/conftest.py

@@ -18,9 +18,15 @@
 import os
 import six
 
-
 try:
     from moto import mock_aws
+except ImportError:
+    from moto import mock_s3 as mock_aws  # ugh
+except ImportError:
+    pass
+
+try:
+    # from moto import mock_aws
     import boto3
     from six.moves.urllib.parse import urlparse
     import json

client/got.txt

@@ -37,10 +37,9 @@ dynamic = ["version"]
 test = [
     'pytest<8.0.0',
     'pytest-cov>=2.5.1,<4',
-    'moto[s3]>5',
+    'moto[s3]>4',
     'twine<4.0.0',
-    # 'pip>=20.0.0,<22.0.0',
-    'pip>=20.0.0',
+    'pip>=20.0.0,<22.0.0',
     'wheel<0.38.0',
     'flake8>=2.5.0,<4.1',
     'responses<0.22.0',

client/pyproject.toml

@@ -30,7 +30,7 @@ def get_version_from_pyver():
         if 'sdist' in sys.argv or 'bdist_wheel' in sys.argv:
             raise ImportError('You must install pyver to create a package')
         else:
-            return '0.dev'
+            return 'noversion'
     version, version_info = pyver.get_version(pkg="datalake_ingester",
                                               public=True)
     return version