Skip to content

Commit 1821af3

Browse files
authored
Merge pull request #234 from zeronet-conservancy/main
2 parents 02c27b8 + 58939a6 commit 1821af3

181 files changed

Lines changed: 4043 additions & 9016 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
venv
2+
docker
3+
data
4+
__pycahce__
5+
log

.github/FUNDING.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
custom: https://zeronet.io/docs/help_zeronet/donate/
1+
liberapay: caryoscelus
2+
ko_fi: caryoscelus
3+
custom: https://caryoscelus.github.io/donate/
Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
---
22
name: Feature request
3-
about: Suggest an idea for ZeroNet
3+
about: Suggest an idea for `zeronet-conservancy`
44
title: ''
5-
labels: ''
5+
labels: 'enhancement'
66
assignees: ''
77

88
---
99

10-
**Is your feature request related to a problem? Please describe.**
11-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12-
13-
**Describe the solution you'd like**
14-
A clear and concise description of what you want to happen.
15-
16-
**Describe alternatives you've considered**
17-
A clear and concise description of any alternative solutions or features you've considered.
18-
19-
**Additional context**
20-
Add any other context or screenshots about the feature request here.
10+
*we have no rigid structure for feature requests right now, but please try to include important details on the matter*
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
workflow_dispatch:
17+
18+
jobs:
19+
analyze:
20+
name: Analyze
21+
runs-on: ubuntu-latest
22+
permissions:
23+
actions: read
24+
contents: read
25+
security-events: write
26+
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
language: [ 'javascript', 'python' ]
31+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
32+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
33+
34+
steps:
35+
- name: Checkout repository
36+
uses: actions/checkout@v2
37+
38+
# Initializes the CodeQL tools for scanning.
39+
- name: Initialize CodeQL
40+
uses: github/codeql-action/init@v2
41+
with:
42+
languages: ${{ matrix.language }}
43+
# If you wish to specify custom queries, you can do so here or in a config file.
44+
# By default, queries listed here will override any specified in a config file.
45+
# Prefix the list here with "+" to use these queries and those in the config file.
46+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
47+
48+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
49+
# If this step fails, then you should remove it and run the build manually (see below)
50+
# - name: Autobuild
51+
# uses: github/codeql-action/autobuild@v2
52+
53+
# ℹ️ Command-line programs to run using the OS shell.
54+
# 📚 https://git.io/JvXDl
55+
56+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
57+
# and modify them (or add more) to build your code if your project
58+
# uses a compiled language
59+
60+
- run: |
61+
python3 -m venv venv
62+
source venv/bin/activate
63+
pip install -r requirements.txt
64+
65+
- name: Perform CodeQL Analysis
66+
uses: github/codeql-action/analyze@v2

.github/workflows/tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: tests
22

3-
on: [push, pull_request]
3+
on:
4+
workflow_dispatch:
45

56
jobs:
67
test:
@@ -9,7 +10,7 @@ jobs:
910
strategy:
1011
max-parallel: 16
1112
matrix:
12-
python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
13+
python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
1314

1415
steps:
1516
- uses: actions/checkout@v2

.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,24 @@ __pycache__/
77

88
# Hidden files
99
.*
10+
!.dockerignore
1011
!/.github
1112
!/.gitignore
1213
!/.travis.yml
1314
!/.gitlab-ci.yml
1415

1516
# Temporary files
1617
*.bak
18+
*~
1719

1820
# Data dir
1921
data/*
22+
docker/data/
2023
*.db
2124

2225
# Virtualenv
2326
env/*
27+
venv/*
2428

2529
# Tor data
2630
tools/tor/data
@@ -33,3 +37,14 @@ zeronet.conf
3337

3438
# ZeroNet log files
3539
log/*
40+
41+
# Enabled plugins that disabled by default
42+
plugins/Bootstrapper
43+
plugins/DonationMessage
44+
plugins/Multiuser
45+
plugins/NoNewSites
46+
plugins/StemPort
47+
plugins/UiPassword
48+
49+
# Build files
50+
src/Build.py

.travis.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
language: python
22
python:
3-
- 3.4
4-
- 3.5
5-
- 3.6
6-
- 3.7
7-
- 3.8
3+
- 3.9
4+
- 3.10
85
services:
96
- docker
107
cache: pip
@@ -40,8 +37,3 @@ after_failure:
4037
after_success:
4138
- codecov
4239
- coveralls --rcfile=src/Test/coverage.ini
43-
notifications:
44-
email:
45-
recipients:
46-
hello@zeronet.io
47-
on_success: change

0 commit comments

Comments
 (0)