ingestr 0.7.3__tar.gz → 0.7.4__tar.gz

{ingestr-0.7.3 → ingestr-0.7.4}/.github/workflows/tests.yml

@@ -19,33 +19,33 @@ env:
 
 
 jobs:
-  tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: install Microsoft ODBC
-        run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-          cache: 'pip'
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        id: cache
-        with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-${{ hashFiles('requirements.txt') }}
-      - name: Install pip dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: make deps-ci
-      - name: run tests
-        run: make test-ci
-      - name: check the formatting
-        run: make lint-ci
+  # tests:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: install Microsoft ODBC
+  #       run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y
+  #     - uses: actions/setup-python@v4
+  #       with:
+  #         python-version: '3.11'
+  #         cache: 'pip'
+  #     - name: Cache dependencies
+  #       uses: actions/cache@v3
+  #       id: cache
+  #       with:
+  #         path: ${{ env.pythonLocation }}
+  #         key: ${{ env.pythonLocation }}-${{ hashFiles('requirements.txt') }}
+  #     - name: Install pip dependencies
+  #       if: steps.cache.outputs.cache-hit != 'true'
+  #       run: make deps-ci
+  #     - name: run tests
+  #       run: make test-ci
+  #     - name: check the formatting
+  #       run: make lint-ci
 
   build-and-push-image:
-    needs: tests
-    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
+    # needs: tests
+    # if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -72,7 +72,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64,linux/arm64/v8
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

ingestr-0.7.4/Dockerfile

@@ -0,0 +1,37 @@
+FROM python:3.11-slim
+
+WORKDIR /app
+
+COPY ./requirements.txt /app/requirements.txt
+
+# Setup dependencies for pyodbc
+RUN \
+  export ACCEPT_EULA='Y' && \
+  # Install build dependencies
+  apt-get update && \
+  apt-get install -y curl gcc libpq-dev build-essential unixodbc-dev g++ apt-transport-https
+
+RUN \ 
+  # Install pyodbc db drivers for MSSQL and PostgreSQL
+  curl -sSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /usr/share/keyrings/microsoft-prod.gpg && \
+  curl -sSL https://packages.microsoft.com/config/debian/12/prod.list | tee /etc/apt/sources.list.d/mssql-release.list
+  
+RUN \
+  # install the rest of them
+  apt-get update && \
+  ACCEPT_EULA=Y apt-get install -y msodbcsql18 odbc-postgresql && \
+  # Update odbcinst.ini to make sure full path to driver is listed, and set CommLog to 0. i.e disables any communication logs to be written to files
+  sed 's/Driver=psql/Driver=\/usr\/lib\/x86_64-linux-gnu\/odbc\/psql/;s/CommLog=1/CommLog=0/' /etc/odbcinst.ini > /tmp/temp.ini && \
+  mv -f /tmp/temp.ini /etc/odbcinst.ini
+
+ENV VIRTUAL_ENV=/usr/local
+ADD --chmod=755 https://astral.sh/uv/install.sh /install.sh
+RUN /install.sh && rm /install.sh
+
+RUN /root/.cargo/bin/uv pip install --system --no-cache -r requirements.txt
+
+COPY . /app
+
+RUN pip3 install -e .
+
+ENTRYPOINT ["ingestr"]

{ingestr-0.7.3 → ingestr-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ingestr
-Version: 0.7.3
+Version: 0.7.4
 Summary: ingestr is a command-line application that ingests data from various sources and stores them in any database.
 Project-URL: Homepage, https://github.com/bruin-data/ingestr
 Project-URL: Issues, https://github.com/bruin-data/ingestr/issues
@@ -14,7 +14,6 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Database
 Requires-Python: >=3.9
-Requires-Dist: connectorx==0.3.3
 Requires-Dist: cx-oracle==8.3.0
 Requires-Dist: databricks-sql-connector==2.9.3
 Requires-Dist: dlt==0.5.1

ingestr-0.7.4/ingestr/src/version.py

@@ -0,0 +1 @@
+__version__ = "0.7.4"

{ingestr-0.7.3 → ingestr-0.7.4}/requirements.txt

@@ -1,4 +1,3 @@
-connectorx==0.3.3
 cx_Oracle==8.3.0
 databricks-sql-connector==2.9.3
 dlt==0.5.1

ingestr-0.7.3/Dockerfile

@@ -1,45 +0,0 @@
-FROM python:3.11-slim
-
-WORKDIR /app
-
-COPY ./requirements.txt /app/requirements.txt
-
-# Setup dependencies for pyodbc
-RUN \
-  export ACCEPT_EULA='Y' && \
-  export MYSQL_CONNECTOR='mysql-connector-odbc-8.0.33-linux-glibc2.28-x86-64bit' && \
-  export MYSQL_CONNECTOR_CHECKSUM='41d03d5df0c631f8071cc697f7714620' && \
-  # Install build dependencies
-  apt-get update && \
-  apt-get install -y curl gcc libpq-dev build-essential unixodbc-dev g++ apt-transport-https && \
-  # Install pyodbc db drivers for MSSQL, PG and MySQL
-  curl -sSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /usr/share/keyrings/microsoft-prod.gpg && \
-  curl -sSL https://packages.microsoft.com/config/debian/12/prod.list | tee /etc/apt/sources.list.d/mssql-release.list && \
-  # install the mysql connector
-  curl -L -o ${MYSQL_CONNECTOR}.tar.gz https://dev.mysql.com/get/Downloads/Connector-ODBC/8.0/${MYSQL_CONNECTOR}.tar.gz && \
-  echo "${MYSQL_CONNECTOR_CHECKSUM} ${MYSQL_CONNECTOR}.tar.gz" | md5sum -c - && \
-  gunzip ${MYSQL_CONNECTOR}.tar.gz && tar xvf ${MYSQL_CONNECTOR}.tar && \
-  cp -r ${MYSQL_CONNECTOR}/bin/* /usr/local/bin && cp -r ${MYSQL_CONNECTOR}/lib/* /usr/local/lib && \
-  myodbc-installer -a -d -n "MySQL ODBC 8.0.33 Driver" -t "Driver=/usr/local/lib/libmyodbc8w.so" && \
-  myodbc-installer -a -d -n "MySQL ODBC 8.0.33" -t "Driver=/usr/local/lib/libmyodbc8a.so" && \
-  # install the rest of them
-  apt-get update && \
-  ACCEPT_EULA=Y apt-get install -y msodbcsql17 msodbcsql18 odbc-postgresql && \
-  # Update odbcinst.ini to make sure full path to driver is listed, and set CommLog to 0. i.e disables any communication logs to be written to files
-  sed 's/Driver=psql/Driver=\/usr\/lib\/x86_64-linux-gnu\/odbc\/psql/;s/CommLog=1/CommLog=0/' /etc/odbcinst.ini > /tmp/temp.ini && \
-  mv -f /tmp/temp.ini /etc/odbcinst.ini && \
-  # Cleanup build dependencies
-  rm -rf ${MYSQL_CONNECTOR}*
-
-
-ENV VIRTUAL_ENV=/usr/local
-ADD --chmod=755 https://astral.sh/uv/install.sh /install.sh
-RUN /install.sh && rm /install.sh
-
-RUN /root/.cargo/bin/uv pip install --system --no-cache -r requirements.txt
-
-COPY . /app
-
-RUN pip3 install -e .
-
-ENTRYPOINT ["ingestr"]

ingestr-0.7.3/ingestr/src/version.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"