Skip to content
Draft
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
1 change: 1 addition & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[run]
branch = True
relative_files = True
source = actstream
omit =
*migrations*
Expand Down
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "pip" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
14 changes: 6 additions & 8 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '23 23 * * 4'
branches: [ main ]

jobs:
analyze:
Expand All @@ -38,11 +36,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +51,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +65,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
36 changes: 30 additions & 6 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
name: Tests

# define when to run the action

# define when to run the action
on:
push:
branches: [ 'master']
branches:
- main
paths:
- '**.py'
- '**.txt'
- '**.yaml'
- '**.toml'
pull_request:
branches: [ 'master']
branches:
- main
paths:
- '**.py'
- '**.txt'
Expand Down Expand Up @@ -81,7 +80,7 @@ jobs:

steps:
# check out revision to test
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# install python
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -110,6 +109,9 @@ jobs:
if: matrix.database == 'postgres'
run: pip install psycopg2-binary>=2.8.6

- name: Install Django ReST framework libraries
run: pip install -U django-rest-framework rest-framework-generic-relations drf-spectacular


# install our package
- name: Install package
Expand All @@ -120,3 +122,25 @@ jobs:
run: coverage run runtests/manage.py test -v3 --noinput actstream testapp testapp_nested
env:
DATABASE_ENGINE: ${{ matrix.database }}
# COVERAGE_FILE: ".coverage.${{ matrix.python_version }}"

- name: Store coverage file
uses: actions/upload-artifact@v3
with:
name: coverage
path: .coverage #.${{ matrix.python_version }}

- name: Coveralls
uses: AndreMiras/coveralls-python-action@develop
with:
parallel: true
flag-name: Unit Test

coveralls_finish:
needs: test
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: AndreMiras/coveralls-python-action@develop
with:
parallel-finished: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ db.sqlite3
runtests/static/
.envrc
.ropeproject/
htmlcov/
109 changes: 56 additions & 53 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -1,105 +1,108 @@
Justin Quick <[email protected]>
Asif Saifuddin Auvi <[email protected]>
Chris Beaven <[email protected]>
ehsabd <[email protected]>
yangxg <[email protected]>
Ben Slavin <[email protected]>
Deepak Prakash <[email protected]>
Frank Wickström <[email protected]>
Nick Sandford <[email protected]>
Manuel Aristarán <[email protected]>
Alexey Boriskin <[email protected]>
Jason Culverhouse <[email protected]>
Michael Jones <[email protected]>
Piet Delport <[email protected]>
Wade Williams <[email protected]>
jordan <[email protected]>
Bruno Amaral <[email protected]>
Christoph Heer <[email protected]>
Jens Nistler <[email protected]>
Josh Ourisman <[email protected]>
Nolan Brubaker <[email protected]>
Trever Shick <[email protected]>
Artem Khurshudov <[email protected]>
Benjamin Kampmann <[email protected]>
Chris <[email protected]>
Christoph Bülter <[email protected]>
David Gouldin <[email protected]>
Dmitriy Narkevich <[email protected]>
Herman Schaaf <herman@herman-Latitude-E6500.(none)>
Jocelyn Delalande <[email protected]>
Matt Katz <[email protected]>
Natan Yellin <[email protected]>
Patrick Altman <[email protected]>
Paul Collins <[email protected]>
Ryan Allen <[email protected]>
Steve Ivy <[email protected]>
Tiago Henriques <[email protected]>
Walter Scheper <[email protected]>
artscoop <[email protected]>
cmwaura <[email protected]>
hugokernel <[email protected]>
jbsag <[email protected]>
moritz <[email protected]>
neelesh <[email protected]>
Aaron Williamson <[email protected]>
Alejandro Seguí <[email protected]>
Alexey Boriskin <[email protected]>
anka-sirota <[email protected]>
Anwesha Das <[email protected]>
Artem Khurshudov <[email protected]>
artscoop <[email protected]>
Asif Saifuddin Auvi <[email protected]>
Aziz M. Bookwala <[email protected]>
Benjamin Kampmann <[email protected]>
Ben Lopatin <[email protected]>
Ben Slavin <[email protected]>
Bob Cribbs <[email protected]>
Bojan Mihelac <[email protected]>
Brian Slater <[email protected]>
Bruno Amaral <[email protected]>
Can Burak Cilingir <[email protected]>
Chris Beaven <[email protected]>
Chris <[email protected]>
Christoph Buelter <[email protected]>
Christoph Bülter <[email protected]>
Christoph Heer <[email protected]>
cmwaura <[email protected]>
David Burke <[email protected]>
David Gouldin <[email protected]>
Deepak Prakash <[email protected]>
Denis <[email protected]>
Denis Surkov <[email protected]>
Dex Bleeker <[email protected]>
Dmitriy Narkevich <[email protected]>
Donald Stufft <[email protected]>
ehsabd <[email protected]>
Elf M. Sternberg <[email protected]>
Filip Wasilewski <[email protected]>
fossabot <[email protected]>
Frank Wickström <[email protected]>
Frank Wickström <[email protected]>
Gilberto Magalhães <[email protected]>
Hameed Gifford <[email protected]>
Hanu Prateek Kunduru <[email protected]>
Herman Schaaf <herman@herman-Latitude-E6500.(none)>
hugokernel <[email protected]>
James <[email protected]>
Jannon Frank <[email protected]>
Jason Culverhouse <[email protected]>
jbsag <[email protected]>
Jeff Gordon <[email protected]>
Jens Nistler <[email protected]>
jess <[email protected]>
Jj <[email protected]>
joaoxsouls <[email protected]>
Jocelyn Delalande <[email protected]>
JocelynDelalande <[email protected]>
jordan <[email protected]>
Josh Ourisman <[email protected]>
jpic <[email protected]>
Justin Quick <[email protected]>
Keith Bussell <[email protected]>
khial mustapha <[email protected]>
Kris Ciccarello <[email protected]>
laginha <[email protected]>
Luis <[email protected]>
Lutaaya Idris <[email protected]>
Manuel Aristarán <[email protected]>
Marc Fargas <[email protected]>
Marcus Aram <[email protected]>
Matt Katz <[email protected]>
Michael Bertolacci <[email protected]>
Michael Jones <[email protected]>
Missuor4ever <[email protected]>
moritz <[email protected]>
Muhammed Kaplan <[email protected]>
Natan Yellin <[email protected]>
neelesh <[email protected]>
Nick Parsons <[email protected]>
Nick Sandford <[email protected]>
Nolan Brubaker <[email protected]>
odeson24 <[email protected]>
Patrick Altman <[email protected]>
Patrick Sier <[email protected]>
Paul Collins <[email protected]>
Paul Nicolet <[email protected]>
Pedro Alcocer <[email protected]>
Pedro Burón <[email protected]>
Peter Walker <[email protected]>
Piet Delport <[email protected]>
riazanovslv <[email protected]>
Rob Terhaar <[email protected]>
Rodrigo Suárez <[email protected]>
Ryan Allen <[email protected]>
Sandip Agrawal <[email protected]>
Santiago Piccinini <[email protected]>
Steve Ivy <[email protected]>
Tamas Leposa <[email protected]>
The Gitter Badger <[email protected]>
Tiago Henriques <[email protected]>
Tim Gates <[email protected]>
Tom Clancy <[email protected]>
Tony Narlock <[email protected]>
Trever Shick <[email protected]>
uy-rrodriguez <[email protected]>
Victor Munene <[email protected]>
Vineet <[email protected]>
Wade Williams <[email protected]>
Walter Scheper <[email protected]>
Xavier L <[email protected]>
yangxg <[email protected]>
Zbigniew Siciarz <[email protected]>
anka-sirota <[email protected]>
fossabot <[email protected]>
jess <[email protected]>
joaoxsouls <[email protected]>
jpic <[email protected]>
laginha <[email protected]>
odeson24 <[email protected]>
riazanovslv <[email protected]>
uy-rrodriguez <[email protected]>
2 changes: 1 addition & 1 deletion CHANGELOG.rst
42 changes: 16 additions & 26 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,37 +1,27 @@
FROM ubuntu:focal
FROM python:3.9

ENV PYTHONUNBUFFERED 1
ENV LC_ALL=C.UTF-8
ARG DEBIAN_FRONTEND=noninteractive

# the base image is also built using this Dockerfile, so we have to reset this
USER root

RUN apt-get -y update && apt-get -y --no-install-recommends install \
build-essential \
gcc \
gettext \
python3-dev \
python3-venv \
&& \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /usr/share/doc/* /usr/share/locale/* /usr/share/man/* && \
mkdir -p /app && \
(useradd -m app || true)

COPY --from=library/docker:latest /usr/local/bin/docker /usr/bin/docker
COPY --from=docker/compose:1.23.2 /usr/local/bin/docker-compose /usr/bin/docker-compose

WORKDIR /app
#
# RUN apt-get -y update && apt-get -y --no-install-recommends install \
# build-essential \
# gcc \
# gettext \
# python3-dev \
# python3-venv \
# && \
# apt-get clean && \
# rm -rf /var/lib/apt/lists/* /usr/share/doc/* /usr/share/locale/* /usr/share/man/* && \
# mkdir -p /app && \
# (useradd -m app || true)

ADD runtests/requirements.txt /app/

USER app
WORKDIR /app

ENV PATH /home/app/venv/bin:${PATH}
ADD runtests/requirements.txt /app/

RUN python3 -m venv ~/venv && \
pip install -r /app/requirements.txt
RUN pip install -r requirements.txt

ENV DJANGO_SETTINGS_MODULE settings

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Django Activity Stream
======================

.. image:: https://github.com/justquick/django-activity-stream/workflows/Test%20and%20deploy/badge.svg
:target: https://github.com/justquick/django-activity-stream/actions?query=workflow%3A%22Test+and+deploy%22
.. image:: https://github.com/justquick/django-activity-stream/actions/workflows/workflow.yaml/badge.svg
:target: https://github.com/justquick/django-activity-stream/actions/workflows/workflow.yaml

.. image:: https://badges.gitter.im/django-activity-stream/Lobby.svg
:alt: Join the chat at https://gitter.im/django-activity-stream/Lobby
Expand Down
15 changes: 15 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Security Policy

## Supported Versions

Use this section to tell people about which versions of your project are
currently being supported with security updates.

| Version | Supported |
| ------- | ------------------ |
| 1.4.x | :white_check_mark: |
| <1.4.0 | :x: |

## Reporting a Vulnerability

[email protected]
2 changes: 1 addition & 1 deletion actstream/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
default_app_config = 'actstream.apps.ActstreamConfig'


__version__ = '1.4.1'
__version__ = '2.0.1'
__author__ = 'Asif Saif Uddin, Justin Quick <[email protected]>'
Loading