Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tag release v3.9.0 #2415

Merged
merged 4 commits into from
May 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ecr-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
push:
branches:
- "main"
- "*-rc"
workflow_dispatch:
buildAlpine:
description: Whether to build an Alpine based image
Expand All @@ -16,7 +17,7 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -145,7 +146,7 @@ jobs:
"type": "section",
"text": {
"type": "mrkdwn",
"text": "View scan results: https://github.com/${{ github.repository }}/security."
"text": "View scan results: https://github.com/${{ github.repository }}/security/code-scanning?query=branch:${{ env.version || github.ref_name }}+is:open++"
}
}
]
Expand Down
49 changes: 49 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,55 @@ Changelog for Onadata

``* represents releases that introduce new migrations``

v3.9.0(2023-05-02)
-----------------

- Add azure token to media files urls
`PR #2388 <https://github.com/onaio/onadata/pull/2388>`
[@ciremusyoka]
- Pass user-provided values as parameters
`PR #2394 <https://github.com/onaio/onadata/pull/2394>`
[@KipSigei]
- Handle scenario where an inactive user is part of an Organization
`PR #2374 <https://github.com/onaio/onadata/pull/2374>`
[@DavisRayM]
- Dependabot updates
`PR #2397 <https://github.com/onaio/onadata/pull/2397>`
[@KipSigei]
- Allow authenticated users to download public form exports
`PR #2396 <https://github.com/onaio/onadata/pull/2396>`
[@ciremusyoka]
- Update savreaderwriter version
`PR #2399 <https://github.com/onaio/onadata/pull/2399>`
[@DavisRayM]
- ignore .python-version
`PR #2402 <https://github.com/onaio/onadata/pull/2402>`
[@kelvin-muchiri]
- fix bug NoneType object has no attribute push
`PR #2403 <https://github.com/onaio/onadata/pull/2403>`
[@kelvin-muchiri]
- Fix IndexError exception raised when comparing functions
`PR #2408 <https://github.com/onaio/onadata/pull/2403>`
[@DavisRayM]
- Bump base image
[@DavisRayM]
`PR #2409 <https://github.com/onaio/onadata/pull/2409>`
- Add statistics endpoint for actstream actions
`PR #2390 <https://github.com/onaio/onadata/pull/2390>`
[@DavisRayM]
- Prevent numeric usernames on user creation
[@KipSigei]
`PR #2407 <https://github.com/onaio/onadata/pull/2407>`
- Assign default team project role to users
`PR #2401 <https://github.com/onaio/onadata/pull/2401>`
[@DavisRayM]
- [SAV Exports] Ensure duplicate metadata fields are handled accordingly
`PR #2412 <https://github.com/onaio/onadata/pull/2412>`
[@DavisRayM]
- Strengthen password standards for users
`PR #2414 <https://github.com/onaio/onadata/pull/2414>`
[@DavisRayM]

v3.8.6(2023-03-07)
------------------
- Handle cases of duplicate metadata fields within exports
Expand Down
71 changes: 41 additions & 30 deletions docker/onadata-uwsgi/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9 as intermediate
FROM python:3.10 as intermediate

ENV DEBIAN_FRONTEND noninteractive
ENV PYTHONUNBUFFERED 1
Expand All @@ -14,7 +14,6 @@ RUN mkdir -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
RUN --mount=type=ssh if [ -n "$optional_packages" ]; then pip install ${optional_packages} ; fi

FROM ubuntu:focal-20230412
COPY --from=intermediate /usr/local/lib/python3.9/site-packages/ /usr/local/lib/python3.9/dist-packages/

ARG release_version=v3.7.1

Expand All @@ -25,49 +24,58 @@ ENV PYTHONUNBUFFERED 1

ENV DJANGO_SETTINGS_MODULE onadata.settings.docker

# Install service dependencies
RUN apt-get update -q &&\
apt-get install -y --no-install-recommends software-properties-common \
binutils \
# Install prerequisite packages
RUN apt-get update -q && \
apt-get install -y --no-install-recommends \
software-properties-common \
binutils \
build-essential \
locales \
netcat \
gcc \
pkg-config \
git \
automake

# Generate and set en_US.UTF-8 locale
RUN locale-gen en_US.UTF-8
ENV LC_ALL en_US.UTF-8
ENV LC_CTYPE en_US.UTF-8
RUN dpkg-reconfigure locales

# Add Deadsnake Repository
RUN add-apt-repository ppa:deadsnakes/ppa -y && apt-get update -q

# Install OnaData Dependencies
RUN apt-get install -y --no-install-recommends \
libproj-dev \
gdal-bin \
memcached \
libmemcached-dev \
build-essential \
supervisor \
python3.9 \
python3-dev \
python3.10 \
python3.10-dev \
python3-pip \
python3-setuptools \
git \
libssl-dev \
libpq-dev \
gfortran \
libatlas-base-dev \
libjpeg-dev \
libxml2-dev \
libxslt1-dev \
libpython3.9-dev \
libpython3.10-dev \
zlib1g-dev \
ghostscript \
python3-celery \
python3-sphinx \
pkg-config \
gcc \
automake \
libtool \
openjdk-11-jre-headless \
libpcre3 \
libpcre3-dev \
locales \
netcat && \
rm -rf /var/lib/apt/lists/*

# Generate and set en_US.UTF-8 locale
RUN locale-gen en_US.UTF-8
ENV LC_ALL en_US.UTF-8
ENV LC_CTYPE en_US.UTF-8
RUN dpkg-reconfigure locales
&& apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

# Create OnaData user and add to tty group
RUN useradd -G tty -m onadata
Expand All @@ -81,14 +89,17 @@ RUN chown -R onadata:onadata /srv/onadata

# Install service requirements
WORKDIR /srv/onadata

COPY --from=intermediate /usr/local/lib/python3.10/site-packages/ /usr/local/lib/python3.10/dist-packages/
# hadolint ignore=DL3013
RUN python3.9 -m pip install --no-cache-dir -U pip && \
python3.9 -m pip install --no-cache-dir -r requirements/base.pip && \
python3.9 -m pip install --no-cache-dir -r requirements/s3.pip && \
python3.9 -m pip install --no-cache-dir -r requirements/ses.pip && \
python3.9 -m pip install --no-cache-dir -r requirements/azure.pip && \
python3.9 -m pip install setuptools==65.5.1 && \
python3.9 -m pip install --no-cache-dir pyyaml uwsgitop
RUN python3.10 -m pip install --no-cache-dir -U pip && \
python3.10 -m pip install --no-cache-dir -r requirements/base.pip && \
python3.10 -m pip install --no-cache-dir -r requirements/s3.pip && \
python3.10 -m pip install --no-cache-dir -r requirements/ses.pip && \
python3.10 -m pip install --no-cache-dir -r requirements/azure.pip && \
python3.10 -m pip install setuptools==65.5.1 && \
python3.10 -m pip install --no-cache-dir pyyaml uwsgitop


# Compile API Docs
RUN make -C docs html
Expand Down
2 changes: 1 addition & 1 deletion onadata/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""
from __future__ import absolute_import, unicode_literals

__version__ = "3.8.6"
__version__ = "3.9.0"


# This will make sure the app is always imported when
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = onadata
version = 3.8.6
version = 3.9.0
description = Collect Analyze and Share Data
long_description = file: README.rst
long_description_content_type = text/x-rst
Expand Down