Skip to content
This repository was archived by the owner on Jan 13, 2024. It is now read-only.

Commit a807516

Browse files
SamR1SamR1
committed
Merge branch 'release-v0.7.0'
2 parents a88485a + 7a41c52 commit a807516

Some content is hidden

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

76 files changed

+2213
-1469
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
.venv
77
__pycache__
88
.pytest_cache
9+
.mypy_cache
910
/.coverage
1011
/.eggs/
1112
/build/

‎.gitlab-ci.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: python:3.9
1+
image: python:3.10
22

33
stages:
44
- lint
@@ -17,10 +17,11 @@ lint:
1717
script:
1818
- pytest --flake8 --isort --black -m "flake8 or isort or black" twootfeed
1919

20-
python-3.6:
21-
stage: tests
20+
type-check:
21+
stage: lint
2222
extends: .python
23-
image: python:3.6
23+
script:
24+
- mypy twootfeed
2425

2526
python-3.7:
2627
stage: tests
@@ -33,6 +34,11 @@ python-3.8:
3334
image: python:3.8
3435

3536
python-3.9:
37+
stage: tests
38+
extends: .python
39+
image: python:3.9
40+
41+
python-3.10:
3642
stage: tests
3743
before_script:
3844
- pip install -e .[test]

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change log
22

3+
## Version 0.7.0 (2022/07/15)
4+
5+
#### New Features
6+
7+
* [PR#29](https://github.com/SamR1/python-twootfeed/pull/29) - Add token to access feeds ⚠️ **breaking changes**
8+
* [PR#28](https://github.com/SamR1/python-twootfeed/pull/28) - Add Mastodon home timeline
9+
10+
#### Misc
11+
* [PR#30](https://github.com/SamR1/python-twootfeed/pull/30) - URLs update ⚠️ **breaking changes**
12+
* dependencies update
13+
14+
315
## Version 0.6.8 (2021/10/05)
416

517
#### Misc

‎Makefile‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@ include Makefile.config
22
-include Makefile.custom.config
33
.SILENT:
44

5+
check: type-check lint test
6+
57
clean:
8+
rm -rf .mypy_cache
9+
rm -rf .pytest_cache
10+
11+
clean-all: clean
612
rm -fr $(VENV)
713
rm -fr *.egg-info
814
rm -fr .eggs
9-
rm -rf .pytest_cache
1015
rm -fr build
1116
rm -rf dist
17+
rm -rf *.log
1218

1319
create-mastodon-cli:
1420
$(PYTHON) $(FLASK_APP)/utils/create_mastodon_client.py
@@ -31,9 +37,11 @@ lint-fix:
3137
$(BLACK) $(FLASK_APP)
3238

3339
serve:
40+
echo 'Running on http://$(HOST):$(PORT)'
3441
$(FLASK) run --with-threads -h $(HOST) -p $(PORT)
3542

3643
run:
44+
echo 'Running on http://$(HOST):$(PORT)'
3745
FLASK_ENV=production && $(GUNICORN) -b 127.0.0.1:5000 "$(FLASK_APP):create_app()" --error-logfile $(GUNICORN_LOG)
3846

3947
venv:
@@ -42,3 +50,7 @@ venv:
4250

4351
test:
4452
$(PYTEST) $(FLASK_APP) --cov $(FLASK_APP) --cov-report term-missing $(PYTEST_ARGS)
53+
54+
type-check:
55+
echo 'Running mypy...'
56+
$(MYPY) $(FLASK_APP)

‎Makefile.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export FLASK_ENV=development
77
export TWOOTFEED_CONFIG_DIR=$(APP_PATH)/
88
export TWOOTFEED_CONFIG_FILE=$(APP_PATH)/config.yml
99
export TWOOTFEED_LOG=twootfeed.log
10+
export TWOOTFEED_SETTINGS=DevelopmentConfig
1011

1112
GUNICORN_LOG=gunicorn.log
1213

@@ -18,6 +19,7 @@ FLASK = $(VENV)/bin/flask
1819
PYTEST = $(VENV)/bin/py.test
1920
GUNICORN = $(VENV)/bin/gunicorn
2021
BLACK = $(VENV)/bin/black
22+
MYPY = $(VENV)/bin/mypy
2123

2224
#Sphinx Docs
2325
SPHINXOPTS ?=

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
# python-twootfeed
2-
**generate an RSS feed from parsed Twitter or Mastodon search and Mastodon bookmarks/favorites**
2+
**generate an RSS feed from parsed Twitter or Mastodon search and Mastodon bookmarks/favorites/home timeline**
33

44
[![PyPI version](https://img.shields.io/pypi/v/twootfeed.svg)](https://pypi.org/project/twootfeed/)
55
[![Downloads](https://pepy.tech/badge/twootfeed)](https://pepy.tech/project/twootfeed)
66
[![Python Version](https://img.shields.io/badge/python-3.6+-brightgreen.svg)](https://python.org)
7+
[![Flask Version](https://img.shields.io/badge/flask-2.1-brightgreen.svg)](http://flask.pocoo.org/)
8+
[![code style: black](https://img.shields.io/badge/code%20style-black-black)](https://black.readthedocs.io/en/stable/)
9+
[![type check: mypy](https://img.shields.io/badge/type%20check-mypy-blue)](http://mypy-lang.org/)
710
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/14d1c00121c04cd2b81453c597639ca6)](https://www.codacy.com/app/SamR1/python-twootfeed)
811
[![Coverage Status](https://coveralls.io/repos/github/SamR1/python-twootfeed/badge.svg?branch=master)](https://coveralls.io/github/SamR1/python-twootfeed?branch=master)
912
[![pipeline status](https://gitlab.com/SamR1/python-twootfeed/badges/master/pipeline.svg)](https://gitlab.com/SamR1/python-twootfeed/commits/master)

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.6.8
1+
0.7.0

‎docs/.buildinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 82efcb603edc85f98bbde204ec7fe6f9
3+
config: ac015f087c3654ff4e74bcd47b106784
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/_images/FreshRSS.png‎

-352 KB
Binary file not shown.

‎docs/_images/MastodonFreshRSS.png‎

-223 KB
Binary file not shown.

0 commit comments

Comments
 (0)