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

Migrate Cabot to Python 3.6.5 and Django 3.2.5 #710

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fcdd422
Actualizadas las dependecias.
Ladrusca Jul 7, 2021
7719e0c
resuelto el tema login
Ladrusca Jul 8, 2021
5b4957b
completamente modularizada
Ladrusca Jul 20, 2021
10e922c
completamente modularizada
Ladrusca Jul 20, 2021
b41fe3b
resuelto el tema enviroment y limpieza de codigo
Ladrusca Aug 6, 2021
d054e7a
resuelto el dockerfile
Ladrusca Aug 6, 2021
73531e1
resueltas las fallas en migraciones, faltante de archivos css, termin…
Ladrusca Aug 9, 2021
759dceb
config pyp
Ladrusca Aug 13, 2021
b847e81
Merge pull request #1 from senzil/senzil
Ladrusca Aug 13, 2021
e577900
cabot3
Ladrusca Aug 13, 2021
23b14e7
modificaciones menores
Ladrusca Aug 23, 2021
66984b6
add image deploy workflow
pablodgonzalez Aug 24, 2021
007cab1
Create codeql-analysis.yml
pablodgonzalez Aug 24, 2021
0f7b713
image deploy workflow
pablodgonzalez Aug 24, 2021
c1768d5
Merge branch 'master' of https://github.com/senzil/cabot
pablodgonzalez Aug 24, 2021
f63e47c
remove requirements-plugins
Ladrusca Aug 24, 2021
1453788
added action for senzil branch
pablodgonzalez Aug 24, 2021
0fe839e
added action for senzil branch
pablodgonzalez Aug 24, 2021
ab0889a
Added git to runner image to install pip package from repositories
pablodgonzalez Aug 25, 2021
059b315
added gunicorn to dockerfile
Ladrusca Aug 25, 2021
a498ef9
changed gunicorn installation to first image docker
Ladrusca Aug 25, 2021
76ad6b4
added whitenoise for static files on prod
Ladrusca Aug 26, 2021
a274a53
correct whitenoise configuration and fixed bug in debug and prod sett…
Ladrusca Aug 26, 2021
d90be53
added entrypoint to dockerfile and changed force_bool method
Ladrusca Aug 26, 2021
7ff2e86
Update .env _example
Ladrusca Aug 26, 2021
9a890ae
added social django auth requirement
Ladrusca Aug 30, 2021
a5d609b
added social django auth requirement
Ladrusca Aug 30, 2021
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
6 changes: 0 additions & 6 deletions .coveragerc

This file was deleted.

4 changes: 0 additions & 4 deletions .foreman

This file was deleted.

71 changes: 71 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '35 7 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

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

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# 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

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
22 changes: 22 additions & 0 deletions .github/workflows/image_deploy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: image-deploy
on:
push:
branches: master
jobs:
build-and-push-image:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
push: true
tags: senzil/cabot:latest
154 changes: 149 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
dev.db
venv/*
backups/*
static/
cabot/.collectstatic/
cabot3/staticfiles/
node_modules/*
.python-eggs/*
cabot.egg-info
cabot/static/
.env
.DS_Store
celerybeat-schedule
Expand All @@ -19,7 +17,153 @@ conf/*.env
dist/
local_config.yml
build/

.dockerignore
docker.env
.idea
Pipfile.lock
.tox/
.tox/

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/
.vscode
# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid
.vscode

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# End of https://www.toptal.com/developers/gitignore/api/python


24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Python: Django",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/manage.py",
"args": [
"runserver"
],
"django": true
}
]
}
Loading