Compare commits
38
Commits
store
...
archlastpython
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e77d7c64e | ||
|
|
550419381a | ||
|
|
fc9f4cde3b | ||
|
|
3f2b863f5a | ||
|
|
8231096b4d | ||
|
|
87268abcc3 | ||
|
|
c67e613ba2 | ||
|
|
76985fa799 | ||
|
|
368a74a1c7 | ||
|
|
dae43435e4 | ||
|
|
ba7998c636 | ||
|
|
0ac6f00ef0 | ||
|
|
2bdc141e2d | ||
|
|
c1ba069b41 | ||
|
|
0271e71974 | ||
|
|
d209ad28c5 | ||
|
|
9f5de228b5 | ||
|
|
92871ae135 | ||
|
|
a702e9f516 | ||
|
|
9bbde03fbd | ||
|
|
c0dc586058 | ||
|
|
ddd7c04e12 | ||
|
|
f220c5b596 | ||
|
|
1eafde9735 | ||
|
|
96433c7f41 | ||
|
|
6ddcf0380b | ||
|
|
ff8f5b64db | ||
|
|
00e5f58014 | ||
|
|
2a5635039b | ||
|
|
282bb58bc3 | ||
|
|
1f25080a36 | ||
|
|
33c828fd99 | ||
|
|
6ae02e1bcb | ||
|
|
e8a3f845f1 | ||
|
|
75629e9fe5 | ||
|
|
68d3df2af7 | ||
|
|
14f804c0ad | ||
|
|
0709a971dd |
@@ -15,8 +15,6 @@ venv
|
||||
.buildpacks
|
||||
*.pem
|
||||
*.crt
|
||||
Pipfile
|
||||
Pipfile.lock
|
||||
.travis.yml
|
||||
.gitignore
|
||||
.dockerignore
|
||||
|
||||
@@ -1 +1,5 @@
|
||||
patreon: marcpartensky
|
||||
github: marcpartensky
|
||||
custom:
|
||||
# - monero:43J2XmRtjDPRLD35UsYGH2AZamFBQz7dt4VdvZXVm3SuadTrvcoXUXBRUNHqukFte23Q5TWXqhbwaLJJgoVQzzbe2AJDANQ
|
||||
- https://paypal.me/marcpartensky
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
name: Docker
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "*"
|
||||
# Publish `v1.2.3` tags as releases.
|
||||
tags:
|
||||
- v*
|
||||
|
||||
# Run tests for any PRs.
|
||||
pull_request:
|
||||
|
||||
env:
|
||||
IMAGE_NAME: website
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Build and push Docker images
|
||||
uses: docker/build-push-action@v3
|
||||
with:
|
||||
context: .
|
||||
push: false
|
||||
tags: marcpartensky/website:latest
|
||||
cache-from: type=local,src=/tmp/.buildx-cache
|
||||
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
|
||||
|
||||
- name: Move cache
|
||||
run: |
|
||||
rm -rf /tmp/.buildx-cache
|
||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
||||
@@ -19,8 +19,6 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Update apt
|
||||
run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
|
||||
- name: Install make
|
||||
run: sudo apt install make -y
|
||||
- name: Install Python3.7
|
||||
@@ -36,13 +34,23 @@ jobs:
|
||||
uses: docker/setup-qemu-action@v1
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
- name: Build and push
|
||||
id: build
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
push: false
|
||||
tags: marcpartensky/website:latest
|
||||
- name: Compose up
|
||||
run: docker-compose -f dev.yml up -d website postgres mysql
|
||||
- name: Test
|
||||
run: docker-compose run test
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
- name: Build and push
|
||||
id: docker_build
|
||||
id: push
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
push: true
|
||||
|
||||
+15
-11
@@ -1,23 +1,27 @@
|
||||
FROM python:3.7.12
|
||||
# ARG timestamp
|
||||
# ARG commit
|
||||
FROM marcpartensky/paru:latest as builder
|
||||
RUN paru -Syyyu --noconfirm python-pipenv npm make
|
||||
USER root
|
||||
COPY . /opt/website
|
||||
WORKDIR /opt/website
|
||||
RUN pipenv update
|
||||
RUN pipenv run ./manage.py collectstatic --noinput
|
||||
RUN npm install -g npm@latest
|
||||
RUN npm install
|
||||
|
||||
FROM marcpartensky/paru:latest
|
||||
LABEL maintainer="marc.partensky@gmail.com"
|
||||
LABEL image="https://hub.docker.com/r/marcpartensky/website"
|
||||
LABEL source="https://github.com/marcpartensky/website"
|
||||
LABEL link="https://marcpartensky.com"
|
||||
RUN paru -Syyyu --noconfirm python npm
|
||||
# ARG timestamp
|
||||
# ARG commit
|
||||
# LABEL build.timestamp=timestamp
|
||||
# LABEL build.commit=commit
|
||||
|
||||
COPY . /app
|
||||
COPY --from=builder /app /app
|
||||
WORKDIR /app
|
||||
|
||||
RUN apt-get update
|
||||
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash
|
||||
RUN apt-get install -y nodejs
|
||||
RUN npm install -g npm@latest
|
||||
RUN npm install
|
||||
|
||||
# No .pyo and easier debugging
|
||||
ENV PYTHONDONTWRITEBYTECODE 1
|
||||
ENV PYTHONUNBUFFERED 1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# HOST := localhost
|
||||
# PORT := 8000
|
||||
PRODUCTION := false
|
||||
# HOST=localhost
|
||||
# PORT=8000
|
||||
PRODUCTION=false
|
||||
|
||||
.PHONY: start list build push setup update init test up down migrate brewstart brewstop dev prod clean deploy
|
||||
|
||||
@@ -56,9 +56,11 @@ prod:
|
||||
clean:
|
||||
docker-compose -f docker-compose.yml down
|
||||
docker-compose -f dev.yml down
|
||||
deploy:
|
||||
testdeploy:
|
||||
DOCKER_HOST=ssh://vps docker-compose -f dev.yml up -d --build --force-recreate --remove-orphans website-test
|
||||
DOCKER_HOST=ssh://vps docker-compose -f docker-compose.dev.ym logs -f website-test
|
||||
deploy: push
|
||||
DOCKER_HOST=ssh://vps docker service update vps_website
|
||||
.env:
|
||||
echo HOST=localhost > .env
|
||||
echo PORT=8000 >> .env
|
||||
|
||||
Generated
+856
-665
File diff suppressed because it is too large
Load Diff
@@ -6,26 +6,26 @@
|
||||
This is the code of my personal website.
|
||||
[https://marcpartensky.com/](https://marcpartensky.com/)
|
||||
|
||||
[](https://marcpartensky.com)
|
||||
|
||||
|
||||
## Light theme
|
||||
[](https://websiteofmarcpartensky.herokuapp.com)
|
||||
[](https://marcpartensky.com)
|
||||
|
||||
## Dark theme
|
||||
[](https://websiteofmarcpartensky.herokuapp.com?theme=dark)
|
||||
[](https://marcpartensky.com?theme=dark)
|
||||
|
||||
## Install
|
||||
|
||||
### From [source](https://github.com/MarcPartensky/Website) (requires [git](https://git-scm.com/), [python](https://www.python.org/), [pip](https://pip.pypa.io/en/stable/installing/))
|
||||
```sh
|
||||
git clone https://github.com/marcpartensky/website
|
||||
```
|
||||
cd website
|
||||
|
||||
```sh
|
||||
pip install -r requirements.txt
|
||||
# or with pipenv (recommended, install pipenv with pip install pipenv)
|
||||
pipenv install
|
||||
```
|
||||
|
||||
```sh
|
||||
./manage.py runserver
|
||||
```
|
||||
|
||||
@@ -37,9 +37,8 @@ pipenv install
|
||||
```sh
|
||||
docker run -it \
|
||||
-e SECRET_KEY=$(openssl rand -base64 32) \
|
||||
-p 80:80 \
|
||||
-p 8080:80 \
|
||||
marcpartensky/website
|
||||
./manage.py runserver
|
||||
```
|
||||
|
||||
#### or run with ssl certificate
|
||||
@@ -48,7 +47,7 @@ docker run -it \
|
||||
-env CERT \ # You must export a ssl certificate path
|
||||
-env KEY \ # You must export a pem key path
|
||||
-e SECRET_KEY=$(openssl rand -base64 32) \
|
||||
-p 443:443 \
|
||||
-p 8443:443 \
|
||||
marcpartensky/website
|
||||
```
|
||||
|
||||
@@ -59,10 +58,6 @@ cd website
|
||||
docker-compose up
|
||||
```
|
||||
|
||||
> If you’re using Docker natively on Linux, Docker Desktop for Mac, or Docker Desktop for Windows, then the web app should now be listening on port 443 on your Docker daemon host. Point your web browser to http://localhost:443 to find the Hello World message. If this doesn’t resolve, you can also try http://127.0.0.1:443.
|
||||
|
||||
From https://docs.docker.com/compose/gettingstarted/
|
||||
|
||||
## Build the docker image from source
|
||||
```sh
|
||||
docker build . -t marcpartensky/website
|
||||
@@ -77,8 +72,7 @@ Build usually last 5 minutes.
|
||||
|
||||
## Notes
|
||||
author: Marc Partensky
|
||||
name: Website of Marc Partensky
|
||||
date: 8/10/2019
|
||||
created: 8/10/2019
|
||||
|
||||
## Heroku Buildpacks
|
||||
|
||||
|
||||
+3
-2
@@ -1,5 +1,6 @@
|
||||
from django.contrib import admin
|
||||
from .models import MarkdownModel
|
||||
from .models import MarkdownModel, NotificationModel, DataModel
|
||||
|
||||
# Register your models here.
|
||||
admin.site.register(MarkdownModel)
|
||||
admin.site.register(NotificationModel)
|
||||
admin.site.register(DataModel)
|
||||
|
||||
@@ -21,16 +21,6 @@ x-common:
|
||||
REDIS_URL: redis:6379
|
||||
|
||||
services:
|
||||
# nginx:
|
||||
# image: jwilder/nginx-proxy
|
||||
# restart: unless-stopped
|
||||
# networks:
|
||||
# - web
|
||||
# ports:
|
||||
# - "127.0.1.1:80:80"
|
||||
# volumes:
|
||||
# - /var/run/docker.sock:/tmp/docker.sock:ro
|
||||
|
||||
website:
|
||||
image: marcpartensky/website
|
||||
environment:
|
||||
@@ -53,6 +43,12 @@ services:
|
||||
- postgres
|
||||
networks:
|
||||
- web
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-fs", "http://website:80/robots.txt"]
|
||||
interval: 1m30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 40s
|
||||
|
||||
postgres:
|
||||
image: postgres
|
||||
@@ -109,32 +105,38 @@ services:
|
||||
networks:
|
||||
- web
|
||||
|
||||
website-test:
|
||||
environment:
|
||||
<<: *website
|
||||
<<: *postgres
|
||||
<<: *redis
|
||||
VIRTUAL_HOST: website.dev
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./Dockerfile
|
||||
working_dir: /app
|
||||
entrypoint: /app/entrypoint.sh
|
||||
command: 80 0.0.0.0
|
||||
volumes:
|
||||
- ".:/app"
|
||||
# website-test:
|
||||
# environment:
|
||||
# <<: *website
|
||||
# <<: *postgres
|
||||
# <<: *redis
|
||||
# VIRTUAL_HOST: website.dev
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: ./Dockerfile
|
||||
# working_dir: /app
|
||||
# entrypoint: /app/entrypoint.sh
|
||||
# command: 80 0.0.0.0
|
||||
# volumes:
|
||||
# - ".:/app"
|
||||
# networks:
|
||||
# - web
|
||||
# - caddy
|
||||
# healthcheck:
|
||||
# test: ["CMD", "curl", "-fs", "http://website:80/robots.txt"]
|
||||
# interval: 1m30s
|
||||
# timeout: 10s
|
||||
# retries: 3
|
||||
# start_period: 40s
|
||||
# labels:
|
||||
# - "caddy=test.marcpartensky.com"
|
||||
# - "caddy.reverse_proxy={{upstreams http 80}}"
|
||||
|
||||
test:
|
||||
image: jwilder/dockerize
|
||||
networks:
|
||||
- web
|
||||
- caddy
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-fs", "http://website:80/robots.txt"]
|
||||
interval: 1m30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 40s
|
||||
labels:
|
||||
- "caddy=test.marcpartensky.com"
|
||||
- "caddy.reverse_proxy={{upstreams http 80}}"
|
||||
command: -wait http://website:8080/healthcheck -timeout 120s -wait-retry-interval 5s
|
||||
|
||||
networks:
|
||||
web:
|
||||
|
||||
@@ -18,6 +18,7 @@ x-common:
|
||||
|
||||
services:
|
||||
website:
|
||||
image: docker.io/marcpartensky/website:latest
|
||||
environment:
|
||||
<<: *website
|
||||
<<: *postgres
|
||||
|
||||
Generated
+32
-32
@@ -173,9 +173,9 @@
|
||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
||||
},
|
||||
"node_modules/is-core-module": {
|
||||
"version": "2.8.1",
|
||||
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
|
||||
"integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
|
||||
"version": "2.9.0",
|
||||
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
|
||||
"integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
|
||||
"dependencies": {
|
||||
"has": "^1.0.3"
|
||||
},
|
||||
@@ -261,9 +261,9 @@
|
||||
"integrity": "sha1-oSvbAQNoHosSapsHHrpMRnx4//4="
|
||||
},
|
||||
"node_modules/minimatch": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
|
||||
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
|
||||
"version": "3.0.8",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
|
||||
"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
|
||||
"dependencies": {
|
||||
"brace-expansion": "^1.1.7"
|
||||
},
|
||||
@@ -272,9 +272,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/minimist": {
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
|
||||
"version": "1.2.6",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
|
||||
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
|
||||
},
|
||||
"node_modules/miniq": {
|
||||
"version": "1.0.1",
|
||||
@@ -386,11 +386,11 @@
|
||||
}
|
||||
},
|
||||
"node_modules/resolve": {
|
||||
"version": "1.21.0",
|
||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz",
|
||||
"integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==",
|
||||
"version": "1.22.0",
|
||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
|
||||
"integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
|
||||
"dependencies": {
|
||||
"is-core-module": "^2.8.0",
|
||||
"is-core-module": "^2.8.1",
|
||||
"path-parse": "^1.0.7",
|
||||
"supports-preserve-symlinks-flag": "^1.0.0"
|
||||
},
|
||||
@@ -498,9 +498,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/uglify-js": {
|
||||
"version": "3.14.5",
|
||||
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz",
|
||||
"integrity": "sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==",
|
||||
"version": "3.15.5",
|
||||
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.5.tgz",
|
||||
"integrity": "sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==",
|
||||
"optional": true,
|
||||
"bin": {
|
||||
"uglifyjs": "bin/uglifyjs"
|
||||
@@ -742,9 +742,9 @@
|
||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
||||
},
|
||||
"is-core-module": {
|
||||
"version": "2.8.1",
|
||||
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
|
||||
"integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
|
||||
"version": "2.9.0",
|
||||
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
|
||||
"integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
|
||||
"requires": {
|
||||
"has": "^1.0.3"
|
||||
}
|
||||
@@ -812,17 +812,17 @@
|
||||
"integrity": "sha1-oSvbAQNoHosSapsHHrpMRnx4//4="
|
||||
},
|
||||
"minimatch": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
|
||||
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
|
||||
"version": "3.0.8",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
|
||||
"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
|
||||
"requires": {
|
||||
"brace-expansion": "^1.1.7"
|
||||
}
|
||||
},
|
||||
"minimist": {
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
|
||||
"version": "1.2.6",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
|
||||
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
|
||||
},
|
||||
"miniq": {
|
||||
"version": "1.0.1",
|
||||
@@ -935,11 +935,11 @@
|
||||
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
|
||||
},
|
||||
"resolve": {
|
||||
"version": "1.21.0",
|
||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz",
|
||||
"integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==",
|
||||
"version": "1.22.0",
|
||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
|
||||
"integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
|
||||
"requires": {
|
||||
"is-core-module": "^2.8.0",
|
||||
"is-core-module": "^2.8.1",
|
||||
"path-parse": "^1.0.7",
|
||||
"supports-preserve-symlinks-flag": "^1.0.0"
|
||||
}
|
||||
@@ -1011,9 +1011,9 @@
|
||||
}
|
||||
},
|
||||
"uglify-js": {
|
||||
"version": "3.14.5",
|
||||
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz",
|
||||
"integrity": "sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==",
|
||||
"version": "3.15.5",
|
||||
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.5.tgz",
|
||||
"integrity": "sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==",
|
||||
"optional": true
|
||||
},
|
||||
"util-deprecate": {
|
||||
|
||||
+68
-64
@@ -8,52 +8,54 @@
|
||||
-i https://pypi.org/simple
|
||||
aioredis==1.3.1
|
||||
appdirs==1.4.4
|
||||
appnope==0.1.2
|
||||
arrow==1.2.1
|
||||
asgiref==3.4.1
|
||||
astroid==2.9.3
|
||||
appnope==0.1.3
|
||||
arrow==1.2.2
|
||||
asgiref==3.5.2
|
||||
astroid==2.11.5
|
||||
async-generator==1.10; python_version >= '3.5'
|
||||
async-timeout==4.0.2
|
||||
attrs==21.4.0
|
||||
autobahn==21.11.1
|
||||
autobahn==22.4.2
|
||||
automat==20.2.0
|
||||
backcall==0.2.0
|
||||
backports.zoneinfo==0.2.1; python_version < '3.9'
|
||||
blessed==1.19.0
|
||||
boto3==1.20.37
|
||||
botocore==1.23.37
|
||||
certifi==2021.10.8
|
||||
blessed==1.19.1
|
||||
boto3==1.23.6
|
||||
botocore==1.26.6
|
||||
bpyutils==0.5.2
|
||||
certifi==2022.5.18.1
|
||||
cffi==1.15.0
|
||||
channels-redis==3.3.1
|
||||
channels-redis==3.4.0
|
||||
channels==3.0.4
|
||||
chardet==4.0.0
|
||||
charset-normalizer==2.0.10; python_version >= '3'
|
||||
click==8.0.3
|
||||
charset-normalizer==2.0.12; python_version >= '3'
|
||||
click==8.1.3
|
||||
colorama==0.4.4
|
||||
commonmark==0.9.1
|
||||
constantly==15.1.0
|
||||
coverage==6.2
|
||||
cryptography==36.0.1
|
||||
coverage==6.4
|
||||
cryptography==37.0.2
|
||||
daphne==3.0.2
|
||||
decorator==5.1.1
|
||||
defusedxml==0.7.1
|
||||
dill==0.3.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
|
||||
dj-database-url==0.5.0
|
||||
django-503==0.1
|
||||
django-admin==2.0.1
|
||||
django-allauth==0.47.0
|
||||
django-allauth==0.50.0
|
||||
django-appconf==1.0.5
|
||||
django-avatar==5.0.0
|
||||
django-compressor==3.1
|
||||
django-compressor==4.0
|
||||
django-cors-middleware==1.5.0
|
||||
django-crispy-forms==1.13.0
|
||||
django-crispy-forms==1.14.0
|
||||
django-excel-base==1.0.4
|
||||
django-excel-response2==3.0.2
|
||||
django-extensions==3.1.5
|
||||
django-ftpserver==0.7.0
|
||||
django-ftpserver==0.8.0
|
||||
django-heroku==0.3.1
|
||||
django-jsonfield-backport==1.0.4
|
||||
django-jsonfield-backport==1.0.5
|
||||
django-libsass==0.9
|
||||
django-markdown-view==0.0.4
|
||||
django-markdown-view==0.0.5
|
||||
django-mdeditor==0.1.20
|
||||
django-picklefield==3.0.1
|
||||
django-q==1.3.9
|
||||
@@ -61,37 +63,37 @@ django-rename-app==0.1.3
|
||||
django-robots==5.0
|
||||
django-shortuuidfield==0.1.3
|
||||
django-six==1.0.4
|
||||
django-sql-explorer==2.3
|
||||
django-sql-explorer==2.4.1
|
||||
django-storages==1.12.3
|
||||
django==3.2.11
|
||||
django==3.2.13
|
||||
djangorestframework==3.13.1
|
||||
docopt==0.6.2
|
||||
docutils==0.18.1
|
||||
flake8==3.9.2
|
||||
future==0.18.2
|
||||
geckodriver-autoinstaller==0.1.0
|
||||
graphviz==0.19.1
|
||||
graphviz==0.20
|
||||
gunicorn==20.1.0
|
||||
h11==0.12.0; python_version >= '3.6'
|
||||
h11==0.13.0; python_version >= '3.6'
|
||||
h2==4.1.0
|
||||
hiredis==2.0.0
|
||||
hpack==4.0.0
|
||||
hyperframe==6.0.1
|
||||
hyperlink==21.0.0
|
||||
idna==3.3
|
||||
importlib-metadata==4.10.1
|
||||
importlib-metadata==4.11.4
|
||||
incremental==21.3.0
|
||||
ipython-genutils==0.2.0
|
||||
ipython==7.31.0
|
||||
ipython==7.33.0
|
||||
isort==5.10.1
|
||||
jedi==0.18.1
|
||||
jeepney==0.7.1
|
||||
jmespath==0.10.0
|
||||
keyring==23.5.0
|
||||
jeepney==0.8.0
|
||||
jmespath==1.0.0
|
||||
keyring==23.5.1
|
||||
keyrings.alt==3.2.0
|
||||
lazy-object-proxy==1.7.1
|
||||
libsass==0.21.0
|
||||
markdown==3.2.2
|
||||
markdown==3.3.7
|
||||
matplotlib-inline==0.1.3; python_version >= '3.5'
|
||||
mccabe==0.6.1
|
||||
mock==4.0.3
|
||||
@@ -99,23 +101,23 @@ msgpack-python==0.5.6
|
||||
msgpack==1.0.3
|
||||
mypy-extensions==0.4.3
|
||||
nose==1.3.7
|
||||
oauthlib==3.1.1
|
||||
oauthlib==3.2.0
|
||||
outcome==1.1.0; python_version >= '3.6'
|
||||
packaging==21.3; python_version >= '3.6'
|
||||
parso==0.8.3
|
||||
pathspec==0.9.0
|
||||
pexpect==4.8.0
|
||||
pickleshare==0.7.5
|
||||
pillow==9.0.0
|
||||
pillow==9.1.1
|
||||
pip-autoremove==0.10.0
|
||||
pip-conflict-checker==0.6.0
|
||||
pip-review==1.1.1
|
||||
pip==21.3.1; python_version >= '3.6'
|
||||
pip==22.1.1; python_version >= '3.7'
|
||||
pipdeptree==2.2.1
|
||||
pipupgrade==1.11.0
|
||||
platformdirs==2.4.1; python_version >= '3.7'
|
||||
pipupgrade==1.12.0
|
||||
platformdirs==2.5.2; python_version >= '3.7'
|
||||
priority==2.0.0
|
||||
prompt-toolkit==3.0.24
|
||||
prompt-toolkit==3.0.29
|
||||
psycopg2-binary==2.9.3
|
||||
psycopg2==2.9.3; python_version >= '3.6'
|
||||
ptyprocess==0.7.0
|
||||
@@ -125,52 +127,54 @@ pycodestyle==2.7.0
|
||||
pycparser==2.21
|
||||
pyflakes==2.3.1
|
||||
pyftpdlib==1.5.6
|
||||
pygments==2.11.2
|
||||
pygments==2.12.0
|
||||
pyhamcrest==2.0.3
|
||||
pyjwt==2.3.0
|
||||
pylint==2.12.2
|
||||
pyopenssl==21.0.0
|
||||
pyparsing==3.0.6
|
||||
pyjwt==2.4.0
|
||||
pylint==2.13.9
|
||||
pyopenssl==22.0.0
|
||||
pyparsing==3.0.9
|
||||
pysocks==1.7.1
|
||||
python-dateutil==2.8.2
|
||||
python-dotenv==0.19.2
|
||||
python-dotenv==0.20.0
|
||||
python3-openid==3.2.0
|
||||
pytz-deprecation-shim==0.1.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
|
||||
pytz==2021.3
|
||||
pytz==2022.1
|
||||
pyyaml==6.0
|
||||
rcssmin==1.1.0
|
||||
redis==3.5.3
|
||||
regex==2021.11.10
|
||||
requests-oauthlib==1.3.0
|
||||
regex==2022.4.24
|
||||
requests-oauthlib==1.3.1
|
||||
requests==2.27.1
|
||||
rich==11.0.0
|
||||
rich==12.4.4
|
||||
rjsmin==1.2.0
|
||||
s3transfer==0.5.0
|
||||
s3transfer==0.5.2
|
||||
screen==1.0.1
|
||||
secretstorage==3.3.1
|
||||
selenium==4.1.0
|
||||
secretstorage==3.3.2
|
||||
selenium==4.1.5
|
||||
service-identity==21.1.0
|
||||
setuptools==60.5.0; python_version >= '3.7'
|
||||
shortuuid==1.0.8
|
||||
setuptools==62.3.2; python_version >= '3.7'
|
||||
shortuuid==1.0.9
|
||||
six==1.16.0
|
||||
sniffio==1.2.0; python_version >= '3.5'
|
||||
sortedcontainers==2.4.0
|
||||
sqlparse==0.4.2
|
||||
toml==0.10.2
|
||||
traitlets==5.1.1
|
||||
tomli==2.0.1; python_version < '3.11'
|
||||
traitlets==5.2.1.post0
|
||||
trio-websocket==0.9.2; python_version >= '3.5'
|
||||
trio==0.19.0; python_version >= '3.6'
|
||||
twisted==21.7.0
|
||||
txaio==21.2.1
|
||||
typed-ast==1.5.1
|
||||
typing-extensions==4.0.1
|
||||
tzdata==2021.5; python_version >= '3.6'
|
||||
tzlocal==4.1
|
||||
urllib3==1.26.8
|
||||
trio==0.20.0; python_version >= '3.7'
|
||||
twisted==22.4.0
|
||||
txaio==22.2.1
|
||||
typed-ast==1.5.4
|
||||
typing-extensions==4.2.0
|
||||
tzdata==2022.1; python_version >= '3.6'
|
||||
tzlocal==4.2
|
||||
urllib3==1.26.9
|
||||
wcwidth==0.2.5
|
||||
whitenoise==5.3.0
|
||||
wrapt==1.13.3
|
||||
wsproto==1.0.0; python_full_version >= '3.6.1'
|
||||
whitenoise==6.1.0
|
||||
wrapt==1.14.1
|
||||
wsproto==1.1.0; python_version >= '3.7'
|
||||
xlwt==1.3.0
|
||||
yarg==0.1.9
|
||||
zipp==3.7.0
|
||||
zipp==3.8.0
|
||||
zope.interface==5.4.0
|
||||
|
||||
Reference in New Issue
Block a user