justquick · auvipy · Sep 5, 2024 · Feb 20, 2022 · Feb 20, 2022 · Feb 20, 2022
diff --git a/.coveragerc b/.coveragerc
@@ -1,5 +1,6 @@
 [run]
 branch = True
+relative_files = True
 source = actstream
 omit =
     *migrations*

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -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"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -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:
@@ -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.
@@ -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
@@ -67,4 +65,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -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'
@@ -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 }}
@@ -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
@@ -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
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ db.sqlite3
 runtests/static/
 .envrc
 .ropeproject/
+htmlcov/
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -1,105 +1,108 @@
-Justin Quick <justquick@gmail.com>
-Asif Saifuddin Auvi <auvipy@gmail.com>
-Chris Beaven <smileychris@gmail.com>
-ehsabd <ehsabd@outlook.com>
-yangxg <zmrenwu@163.com>
-Ben Slavin <benjamin.slavin@gmail.com>
-Deepak Prakash <dp@deepakprakash.com>
-Frank Wickström <frank.wickstrom@anders.fi>
-Nick Sandford <nick@sandford.id.au>
-Manuel Aristarán <jazzido@jazzido.com>
-Alexey Boriskin <sun.void@gmail.com>
-Jason Culverhouse <jason@mischievous.org>
-Michael Jones <m.pricejones@gmail.com>
-Piet Delport <piet@byteorbit.com>
-Wade Williams <wade@wadewilliams.com>
-jordan <jordan@192.168.1.5>
-Bruno Amaral <mail@brunoamaral.eu>
-Christoph Heer <Christoph.Heer@gmail.com>
-Jens Nistler <opensource@jensnistler.de>
-Josh Ourisman <josh@joshourisman.com>
-Nolan Brubaker <nolan@nbrubaker.com>
-Trever Shick <trevershick@gmail.com>
-Artem Khurshudov <art1783@gmail.com>
-Benjamin Kampmann <ben.kampmann@googlemail.com>
-Chris <chris@piemonster.me>
-Christoph Bülter <cb109@users.noreply.github.com>
-David Gouldin <david@gould.in>
-Dmitriy Narkevich <github@dimier.org>
-Herman Schaaf <herman@herman-Latitude-E6500.(none)>
-Jocelyn Delalande <jdelalande@oasiswork.fr>
-Matt Katz <gitorious@morelightmorelight.com>
-Natan Yellin <aantny@gmail.com>
-Patrick Altman <paltman@gmail.com>
-Paul Collins <paul.collins.iii@gmail.com>
-Ryan Allen <ryan@ryangallen.com>
-Steve Ivy <steve@wallrazer.com>
-Tiago Henriques <trinosauro@gmail.com>
-Walter Scheper <scheper@unc.edu>
-artscoop <artscoop93.info@gmail.com>
-cmwaura <cmmwaura@ucdavis.edu>
-hugokernel <hugo@digitalspirit.org>
-jbsag <joshjb1991@gmail.com>
-moritz <moritz.fickenscher@fau.de>
-neelesh <neelesh@gmail.com>
 Aaron Williamson <aaron@copiesofcopies.org>
 Alejandro Seguí <alesegdia@gmail.com>
+Alexey Boriskin <sun.void@gmail.com>
+anka-sirota <176934+anka-sirota@users.noreply.github.com>
 Anwesha Das <anwesha@das.community>
+Artem Khurshudov <art1783@gmail.com>
+artscoop <artscoop93.info@gmail.com>
+Asif Saifuddin Auvi <auvipy@gmail.com>
 Aziz M. Bookwala <aziz.mansur@gmail.com>
+Benjamin Kampmann <ben.kampmann@googlemail.com>
 Ben Lopatin <ben.lopatin@wellfireinteractive.com>
+Ben Slavin <benjamin.slavin@gmail.com>
 Bob Cribbs <bcribbs@zehnergroup.com>
 Bojan Mihelac <bmihelac@mihelac.org>
 Brian Slater <36425025+slater-brian-john@users.noreply.github.com>
+Bruno Amaral <mail@brunoamaral.eu>
 Can Burak Cilingir <can@canb.net>
+Chris Beaven <smileychris@gmail.com>
+Chris <chris@piemonster.me>
 Christoph Buelter <christoph.buelter@myshopradio.de>
+Christoph Bülter <cb109@users.noreply.github.com>
+Christoph Heer <Christoph.Heer@gmail.com>
+cmwaura <cmmwaura@ucdavis.edu>
 David Burke <dmbst32@gmail.com>
+David Gouldin <david@gould.in>
+Deepak Prakash <dp@deepakprakash.com>
 Denis <denis_davidyuk@hotmail.com>
 Denis Surkov <surkov0denis@yandex.ru>
 Dex Bleeker <dex@bleeker.nl>
+Dmitriy Narkevich <github@dimier.org>
 Donald Stufft <donald.stufft@gmail.com>
+ehsabd <ehsabd@outlook.com>
 Elf M. Sternberg <elf.sternberg@gmail.com>
 Filip Wasilewski <en@ig.ma>
+fossabot <badges@fossa.io>
 Frank Wickström <frank@bambuser.com>
+Frank Wickström <frank.wickstrom@anders.fi>
 Gilberto Magalhães <g.magalhaes@consultoriasigma.com.br>
 Hameed Gifford <giff.h92@gmail.com>
 Hanu Prateek Kunduru <hanuprateek@users.noreply.github.com>
+Herman Schaaf <herman@herman-Latitude-E6500.(none)>
+hugokernel <hugo@digitalspirit.org>
 James <12661555+jmsmkn@users.noreply.github.com>
 Jannon Frank <jannon.frank@tellagami.com>
+Jason Culverhouse <jason@mischievous.org>
+jbsag <joshjb1991@gmail.com>
 Jeff Gordon <jgordon005@gmail.com>
+Jens Nistler <opensource@jensnistler.de>
+jess <jessachandler@gmail.com>
 Jj <jjdelc@gmail.com>
+joaoxsouls <joaoxsouls@gmail.com>
+Jocelyn Delalande <jdelalande@oasiswork.fr>
 JocelynDelalande <JocelynDelalande@users.noreply.github.com>
+jordan <jordan@192.168.1.5>
+Josh Ourisman <josh@joshourisman.com>
+jpic <jamespic@gmail.com>
+Justin Quick <justquick@gmail.com>
 Keith Bussell <kbussell@gmail.com>
+khial mustapha <khial.mustaphab32@gmail.com>
 Kris Ciccarello <kmctown@users.noreply.github.com>
+laginha <diogo.laginha.machado@gmail.com>
 Luis <luis@wikirealty.com>
+Lutaaya Idris <lutaaya.idris@captiq.com>
+Manuel Aristarán <jazzido@jazzido.com>
 Marc Fargas <telenieko@telenieko.com>
+Marcus Aram <marcus@oxar.nl>
+Matt Katz <gitorious@morelightmorelight.com>
 Michael Bertolacci <m.bertolacci@gmail.com>
+Michael Jones <m.pricejones@gmail.com>
 Missuor4ever <sayseesea@vip.qq.com>
+moritz <moritz.fickenscher@fau.de>
 Muhammed Kaplan <gokdeniz91@gmail.com>
+Natan Yellin <aantny@gmail.com>
+neelesh <neelesh@gmail.com>
 Nick Parsons <nparsons08@gmail.com>
+Nick Sandford <nick@sandford.id.au>
+Nolan Brubaker <nolan@nbrubaker.com>
+odeson24 <odeson24@gmail.com>
+Patrick Altman <paltman@gmail.com>
 Patrick Sier <pjsier@users.noreply.github.com>
+Paul Collins <paul.collins.iii@gmail.com>
 Paul Nicolet <nicoletpaul@orange.fr>
 Pedro Alcocer <pealco@gmail.com>
 Pedro Burón <pedro@witoi.com>
 Peter Walker <peterw@suprafax.net>
+Piet Delport <piet@byteorbit.com>
+riazanovslv <30866558+riazanovslv@users.noreply.github.com>
 Rob Terhaar <rob@atlanticdynamic.com>
 Rodrigo Suárez <rodrigosrz12@gmail.com>
+Ryan Allen <ryan@ryangallen.com>
 Sandip Agrawal <s@sandipagrawal.com>
 Santiago Piccinini <spiccinini@codigosur.org>
+Steve Ivy <steve@wallrazer.com>
 Tamas Leposa <lt@lab85.com>
 The Gitter Badger <badger@gitter.im>
+Tiago Henriques <trinosauro@gmail.com>
 Tim Gates <tim.gates@iress.com>
 Tom Clancy <tclancy@gmail.com>
 Tony Narlock <tony@git-pull.com>
+Trever Shick <trevershick@gmail.com>
+uy-rrodriguez <5296200+uy-rrodriguez@users.noreply.github.com>
 Victor Munene <victor@regulusweb.com>
 Vineet <naikvin@gmail.com>
+Wade Williams <wade@wadewilliams.com>
+Walter Scheper <scheper@unc.edu>
 Xavier L <xavier.l@magnax.ca>
+yangxg <zmrenwu@163.com>
 Zbigniew Siciarz <antyqjon@gmail.com>
-anka-sirota <176934+anka-sirota@users.noreply.github.com>
-fossabot <badges@fossa.io>
-jess <jessachandler@gmail.com>
-joaoxsouls <joaoxsouls@gmail.com>
-jpic <jamespic@gmail.com>
-laginha <diogo.laginha.machado@gmail.com>
-odeson24 <odeson24@gmail.com>
-riazanovslv <30866558+riazanovslv@users.noreply.github.com>
-uy-rrodriguez <5296200+uy-rrodriguez@users.noreply.github.com>
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1 +1 @@
-./docs/source/changelog.rst
+./docs/changelog.rst
diff --git a/Dockerfile b/Dockerfile
@@ -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
 

diff --git a/README.rst b/README.rst
@@ -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

diff --git a/SECURITY.md b/SECURITY.md
@@ -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
+
+auvipy@gmail.com
diff --git a/actstream/__init__.py b/actstream/__init__.py
@@ -12,5 +12,5 @@
         default_app_config = 'actstream.apps.ActstreamConfig'
 
 
-__version__ = '1.4.1'
+__version__ = '2.0.1'
 __author__ = 'Asif Saif Uddin, Justin Quick <justquick@gmail.com>'