Skip to content

Commit a4ce1da

Browse files
authored
Release notes for 2.3.0 (#109)
1 parent 5541784 commit a4ce1da

File tree

5 files changed

+55
-11
lines changed

5 files changed

+55
-11
lines changed

.github/workflows/main.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,28 @@ jobs:
66
strategy:
77
matrix:
88
include:
9-
- python-version: 3.8
9+
- python-version: "2.7"
1010
env:
1111
TOXENV: min
12-
- python-version: 3.8
12+
- python-version: "2.7"
1313
env:
1414
TOXENV: py
15-
- python-version: 3.9
15+
- python-version: "3.4"
16+
env:
17+
TOXENV: py34
18+
- python-version: "3.5"
19+
env:
20+
TOXENV: py
21+
- python-version: "3.6"
22+
env:
23+
TOXENV: py
24+
- python-version: "3.7"
25+
env:
26+
TOXENV: py
27+
- python-version: "3.8"
28+
env:
29+
TOXENV: py
30+
- python-version: "3.9"
1631
env:
1732
TOXENV: py
1833
- python-version: "3.10"
@@ -21,16 +36,19 @@ jobs:
2136
- python-version: "3.11"
2237
env:
2338
TOXENV: py
24-
- python-version: "3.11"
39+
- python-version: "3.12"
40+
env:
41+
TOXENV: py
42+
- python-version: "3.12"
2543
env:
2644
TOXENV: security
27-
- python-version: "3.11"
45+
- python-version: "3.12"
2846
env:
2947
TOXENV: docs
3048
steps:
3149
- uses: actions/checkout@v2
3250
- name: Set up Python ${{ matrix.python-version }}
33-
uses: actions/setup-python@v2
51+
uses: MatteoH2O1999/setup-python@v2
3452
with:
3553
python-version: ${{ matrix.python-version }}
3654
- name: Install dependencies

docs/news.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
Changes
44
=======
55

6+
v2.3.0 (to be released)
7+
-----------------------
8+
9+
Added support for the upcoming proxy API of `Zyte API <zyte-api>`_.
10+
11+
.. _zyte-api: https://docs.zyte.com/zyte-api/get-started.html
12+
13+
Added a BSD-3-Clause license file.
14+
615
v2.2.0 (2022-08-05)
716
-------------------
817

setup.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,16 @@
2222
'License :: OSI Approved :: BSD License',
2323
'Operating System :: OS Independent',
2424
'Programming Language :: Python',
25+
'Programming Language :: Python :: 2.7',
26+
'Programming Language :: Python :: 3.4',
27+
'Programming Language :: Python :: 3.5',
28+
'Programming Language :: Python :: 3.6',
29+
'Programming Language :: Python :: 3.7',
2530
'Programming Language :: Python :: 3.8',
2631
'Programming Language :: Python :: 3.9',
2732
'Programming Language :: Python :: 3.10',
2833
'Programming Language :: Python :: 3.11',
34+
'Programming Language :: Python :: 3.12',
2935
'Framework :: Scrapy',
3036
'Intended Audience :: Developers',
3137
'Topic :: Internet :: WWW/HTTP',

tests/test_all.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ def test_client_header(self):
971971
mw.open_spider(self.spider)
972972
req1 = Request('http://www.scrapytest.org')
973973
self.assertEqual(mw.process_request(req1, self.spider), None)
974-
client = b'scrapy-zyte-smartproxy/%s' % __version__.encode()
974+
client = 'scrapy-zyte-smartproxy/{}'.format(__version__).encode()
975975
self.assertEqual(req1.headers.get('X-Crawlera-Client'), client)
976976
self.assertEqual(req1.headers.get('Zyte-Client'), None)
977977

@@ -1180,5 +1180,5 @@ def test_header_drop_warnings(self, mock_logger):
11801180
headers={"Zyte-Foo": "bar", "X-Crawlera-Foo": "bar"},
11811181
)
11821182
self.assertEqual(mw.process_request(request, self.spider), None)
1183-
mock_logger.warning.assert_not_called() # No warnings for drop all scenarios
1183+
mock_logger.warning.assert_not_called() # No warnings for "drop all" scenarios
11841184

tox.ini

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tox.ini
22
[tox]
3-
envlist = min,py38,py39,py310,py311,docs,security
3+
envlist = min,py27,py34,py35,py36,py37,py38,py39,py310,py311,docs,security
44

55
[testenv]
66
deps =
@@ -10,14 +10,25 @@ commands =
1010
py.test --doctest-modules --cov=scrapy_zyte_smartproxy {posargs:scrapy_zyte_smartproxy tests}
1111

1212
[testenv:min]
13-
basepython = python3.8
13+
basepython = python2.7
1414
deps =
1515
Scrapy==1.4.0
1616
six==1.10.0
17-
Twisted==18.9.0 # https://github.com/twisted/twisted/commit/ee535041258e7ef0b3223d2e12cd9aaa0bc2289f
17+
Twisted==13.1.0 # https://github.com/scrapy/scrapy/blob/1.4.0/setup.py#L45
1818
w3lib==1.17.0
1919
-rtests/requirements.txt
2020

21+
[testenv:py34]
22+
basepython = python3.4
23+
deps =
24+
Scrapy
25+
six
26+
# Latest Twisted that does not install an embedded version of incremental
27+
# that’s incompatible with Python 3.4.
28+
Twisted==16.4.1
29+
w3lib
30+
-rtests/requirements.txt
31+
2132
[testenv:security]
2233
deps =
2334
bandit

0 commit comments

Comments
 (0)