Skip to content

Commit 7929dad

Browse files
rybarczykjrybarczykj
committed
fix conflicts
2 parents bdc846c + d07a405 commit 7929dad

File tree

101 files changed

+3796
-3770
lines changed

Some content is hidden

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

101 files changed

+3796
-3770
lines changed

‎.github/workflows/build.yaml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
# run at 7:00 on the first of every month
8+
- cron: '0 7 1 * *'
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
continue-on-error: ${{ matrix.python-version == 'pypy3' }}
14+
strategy:
15+
matrix:
16+
python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
17+
steps:
18+
- uses: actions/checkout@v2
19+
with:
20+
fetch-depth: 0
21+
- name: Set up Python ${{ matrix.python-version }}
22+
uses: actions/setup-python@v2
23+
with:
24+
python-version: ${{ matrix.python-version }}
25+
- name: Install dependencies
26+
run: |
27+
python -m pip install --upgrade pip
28+
pip install -r requirements.txt
29+
pip install urwid twisted watchdog "jedi >=0.16" babel "sphinx >=1.5"
30+
pip install pytest pytest-cov numpy
31+
- name: Build with Python ${{ matrix.python-version }}
32+
run: |
33+
python setup.py build
34+
- name: Build documentation
35+
run: |
36+
python setup.py build_sphinx
37+
python setup.py build_sphinx_man
38+
- name: Test with pytest
39+
run: |
40+
pytest --cov=bpython --cov-report=xml -v
41+
- name: Upload coverage to Codecov
42+
uses: codecov/codecov-action@v1
43+
env:
44+
PYTHON_VERSION: ${{ matrix.python-version }}
45+
with:
46+
file: ./coverage.xml
47+
env_vars: PYTHON_VERSION
48+
if: ${{ always() }}

‎.github/workflows/lint.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Linters
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
black:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Set up Python
13+
uses: actions/setup-python@v2
14+
- name: Install dependencies
15+
run: |
16+
python -m pip install --upgrade pip
17+
pip install black codespell
18+
- name: Check with black
19+
run: black --check .
20+
21+
codespell:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v2
25+
- uses: codespell-project/actions-codespell@master
26+
with:
27+
skip: '*.po'
28+
ignore_words_list: ba,te,deltion

‎.travis.install.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.travis.script.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.travis.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎AUTHORS renamed to ‎AUTHORS.rst

File renamed without changes.

‎CHANGELOG renamed to ‎CHANGELOG.rst

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,89 @@
11
Changelog
22
=========
33

4+
0.22
5+
----
6+
7+
General information:
8+
9+
New features:
10+
11+
Fixes:
12+
13+
Changes to dependencies:
14+
15+
0.21
16+
----
17+
18+
General information:
19+
20+
* Support for Python 2 has been dropped.
21+
22+
New features:
23+
24+
* #643: Provide bpython._version if built from Github tarballs
25+
* #849: Make import completion skip list configurable
26+
* #876: Check spelling with codespell
27+
Thanks to Christian Clauss
28+
29+
Fixes:
30+
31+
* #847: Fix import completion of modules
32+
* #857: Replace remaining use of deprecated imp with importlib
33+
* #862: Upgrade curtsies version requirements
34+
Thanks to Kelsey Blair
35+
* #863: State correct default config file directory
36+
Thanks to niloct
37+
* #866: Add more directories to the default import completion skip list
38+
* #873: Handle 'd' when mapping colors
39+
* #874: Avoid breakage with six's importer
40+
41+
Changes to dependencies:
42+
43+
* curtsies >= 0.3.5 is now required
44+
* pyxdg is now required
45+
* wcwidth has been replaced with cwcwidth
46+
47+
0.20.1
48+
------
49+
50+
Fixes:
51+
52+
* Fix check of key code (fixes #859)
53+
454
0.20
555
----
656

57+
General information:
58+
59+
* The next release of bpython (0.20) will drop support for Python 2.
60+
* Support for Python 3.9 has been added. Support for Python 3.5 has been
61+
dropped.
62+
763
New features:
864

65+
* #802: Provide redo.
66+
Thanks to Evan.
67+
* #835: Add support for importing namespace packages.
68+
Thanks to Thomas Babej.
69+
970
Fixes:
1071

72+
* #622: Provide encoding attribute for FakeOutput.
73+
* #806: Prevent symbolic link loops in import completion.
74+
Thanks to Etienne Richart.
75+
* #807: Support packages using importlib.metadata API.
76+
Thanks to uriariel.
77+
* #809: Fix support for Python 3.9's ast module.
78+
* #817: Fix cursor position with full-width characters.
79+
Thanks to Jack Rybarczyk.
80+
* #853: Fix invalid escape sequences.
81+
1182
0.19
1283
----
1384

1485
General information:
86+
1587
* The bpython-cli and bpython-urwid rendering backends have been deprecated and
1688
will show a warning that they'll be removed in a future release when started.
1789
* Usage in combination with Python 2 has been deprecated. This does not mean that
@@ -25,6 +97,7 @@ General information:
2597
New features:
2698

2799
Fixes:
100+
28101
* #765: Display correct signature for decorated functions.
29102
Thanks to Benedikt Rascher-Friesenhausen.
30103
* #776: Protect get_args from user code exceptions
@@ -37,10 +110,12 @@ Support for Python 3.8 has been added. Support for Python 3.4 has been dropped.
37110
----
38111

39112
New features:
113+
40114
* #713 expose globals in bpdb debugging.
41115
Thanks to toejough.
42116

43117
Fixes:
118+
44119
* Fix file locking on Windows.
45120
* Exit gracefully if config file fails to be loaded due to encoding errors.
46121
* #744: Fix newline handling.
@@ -55,18 +130,21 @@ Support for Python 3.3 has been dropped.
55130
------
56131

57132
Fixes:
133+
58134
* Reverted #670 temporarily due to performance impact
59135
on large strings being output.
60136

61137
0.17
62138
----
63139

64140
New features:
141+
65142
* #641: Implement Ctrl+O.
66143
* Add default_autoreload config option.
67144
Thanks to Alex Frieder.
68145

69146
Fixes:
147+
70148
* Fix deprecation warnings.
71149
* Do not call signal outside of main thread.
72150
Thanks to Max Nordlund.
@@ -86,9 +164,11 @@ Fixes:
86164
----
87165

88166
New features:
167+
89168
* #466: Improve handling of completion box height.
90169

91170
Fixes:
171+
92172
* Fix various spelling mistakes.
93173
Thanks to Josh Soref and Simeon Visser.
94174
* #601: Fix Python 2 issues on Windows.
@@ -722,7 +802,7 @@ Suggestions/bug reports/patches are welcome regarding this.
722802
-----
723803
Well, hopefully we're one step closer to making the list sizing
724804
stuff work. I really hate doing code for that kind of thing as I
725-
never get it quite right, but with perseverence it should end up
805+
never get it quite right, but with perseverance it should end up
726806
being completely stable; it's not the hardest thing in the world.
727807

728808
Various cosmetic fixes have been put in at the request of a bunch

‎MANIFEST.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
include .pycheckrc
2-
include AUTHORS
3-
include CHANGELOG
2+
include AUTHORS.rst
3+
include CHANGELOG.rst
44
include LICENSE
55
include data/bpython.png
66
include data/org.bpython-interpreter.bpython.desktop
77
include data/org.bpython-interpreter.bpython.appdata.xml
8-
include doc/sphinx/source/conf.py
8+
include doc/sphinx/source/*.py
99
include doc/sphinx/source/*.rst
1010
include doc/sphinx/source/logo.png
11-
include *.theme
1211
include bpython/test/*.py
1312
include bpython/test/*.theme
1413
include bpython/translations/*/LC_MESSAGES/bpython.po
1514
include bpython/translations/*/LC_MESSAGES/bpython.mo
1615
include bpython/sample-config
16+
include theme/*.theme

0 commit comments

Comments
 (0)