ergusto

How to resolve package-lock.json conflicts

It is not possible to resolve conflicts of package-lock.json in GitHub's merge tool and you need to do a manual merge.

1. Update the master branch with the latest changes:

   git checkout master
   git pull
   

2. Merge your feature branch into master:

ergusto

#!/bin/sh

WEBHOOK_URL="put your url here"
JSON="{\"content\":null,\"embeds\": [{\"color\": \"16237652\"},{\"timestamp\": \"YYYY-MM-DDTHH:MM:SS.MSSZ\"},{\"fields\": [{\"name\": \"Grabbed Movie\",\"value\": \"$radarr_movie_title\"},{\"name\": \"Release Name\",\"value\": \"$radarr_release_title\"},{\"name\": \"Quality\",\"value\": \"$radarr_release_quality\",\"inline\": true},{\"name\": \"Source\",\"value\": \"$radarr_release_indexer\",\"inline\": true},{\"name\": \"Size\",\"value\": \"$radarr_release_size\"}]}]}\"

curl -d "$JSON" -H "Content-Type: application/json" "$WEBHOOK_URL"

ergusto

import functools

from channels.handler import AsgiRequest
from rest_framework.exceptions import AuthenticationFailed
from rest_framework.settings import api_settings


authenticators = [auth() for auth in api_settings.DEFAULT_AUTHENTICATION_CLASSES]

ergusto

"""
Fix for some issues with the original code from Heroku:
	https://devcenter.heroku.com/articles/s3-upload-python
	
This example is also designed for use with Django, not Flask as in the original.
"""

import base64
import hashlib
import hmac

ergusto

// dependencies
var async = require('async');
var path = require('path');
var AWS = require('aws-sdk');
var gm = require('gm').subClass({
    imageMagick: true
});
var util = require('util');
// get reference to S3 client
var s3 = new AWS.S3();

ergusto

Install Python

$ brew install readline sqlite gdbm --universal
$ brew install python --universal --framework
$ python --version
Python 2.7

Symlinks...

ergusto

import markdown as mkdn

from django import template
from django.utils.safestring import mark_safe

register = template.Library()


@register.filter()
def markdown(value):