Skip to content

Commit 034e810

Browse files
committed
pypi 0.2.2 release, troubleshoot appveyor RabbitMQ
1 parent 977e6d8 commit 034e810

File tree

11 files changed

+56
-27
lines changed

11 files changed

+56
-27
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
========================
44

55
12/3/18
6+
- pypi 0.2.2 release
7+
68
- Fixed a bug in BaseWorker.load_items() method which previously resulted
79
in losing scrape data when the number of workers did not equal number of
810
tasks. Now, using any number of workers or pool size will result in

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
.. image:: https://img.shields.io/badge/Python-3.6%20%7C%203.7-blue.svg
77
:target: https://github.com/bomquote/transistor
8-
.. image:: https://img.shields.io/badge/pypi%20package-0.2.1-blue.svg
9-
:target: https://pypi.org/project/transistor/0.2.1/
8+
.. image:: https://img.shields.io/badge/pypi%20package-0.2.2-blue.svg
9+
:target: https://pypi.org/project/transistor/0.2.2/
1010
.. image:: https://img.shields.io/badge/Status-Beta-blue.svg
1111
:target: https://github.com/bomquote/transistor
1212
.. image:: https://img.shields.io/badge/license-MIT-lightgrey.svg

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ install:
105105
- cmd: pip install mechanicalsoup==0.11.0
106106
- cmd: pip install requests==2.20.1
107107
- cmd: pip install urllib3==1.24.1
108-
- cmd: pip install keyring==16.1.1
108+
- cmd: pip install keyring==17.0.0
109109
- cmd: pip install kombu==4.2.1
110+
- cmd: python x:\host\transistor\appveyor\check_rabbitmq_connection.py
110111
- cmd: pip install lxml==4.2.5
111112
- cmd: pip install lz4==2.1.2
112113
- cmd: pip install openpyxl==2.5.2
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# """
2+
# transistor.appveyor.check_rabbitmq_connection
3+
# ~~~~~~~~~~~~
4+
# This is a script to check the rabbitmq connection works.
5+
# It is included here to facilitate various test cases in appveyor CI.
6+
#
7+
# :copyright: Copyright (C) 2018 by BOM Quote Limited
8+
# :license: The MIT License, see LICENSE for more details.
9+
# ~~~~~~~~~~~~
10+
# """
11+
12+
from kombu import Connection
13+
14+
# try to establish connection and check its status
15+
try:
16+
connection = Connection("pyamqp://guest:guest@localhost:5672//")
17+
connection.connect()
18+
if connection.connected:
19+
print('OK - successfully connected to RabbitMQ')
20+
else:
21+
print('FAIL - did not connect to RabbitMQ')
22+
connection.close()
23+
exit(0)
24+
except Exception as error:
25+
print('Error:', error.__class__.__name__)
26+
exit(1)
-119 KB
Binary file not shown.

dist/transistor-0.2.1.tar.gz

-114 KB
Binary file not shown.
138 KB
Binary file not shown.

dist/transistor-0.2.2.tar.gz

120 KB
Binary file not shown.

requirements/prod.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mechanicalsoup==0.11.0
22
requests==2.20.1
33
urllib3==1.24.1
4-
keyring==16.1.1
4+
keyring==17.0.0
55
kombu==4.2.1
66
lxml==4.2.5
77
lz4==2.1.2

setup.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,31 @@
3333

3434
# What packages are required for this module to be executed?
3535
REQUIRED = [
36-
'mechanicalsoup>=0.11.0',
37-
'requests>=2.20.1',
38-
'urllib3>=1.24.1',
39-
'keyring>=16.1.1',
40-
'lxml>=4.2.5',
41-
'lz4>=2.1.2',
42-
'pyexcel>=0.5.9.1',
43-
'pyexcel-io>=0.5.10',
44-
'pyexcel-ods3>=0.5.3',
45-
'pyexcel-webio>=0.1.4',
46-
'pyexcel-xls>=0.5.8',
47-
'pyexcel-xlsx>=0.5.6',
48-
'cookiecutter>=1.6.0',
49-
'cssselect>=1.0.3',
50-
'w3lib>=1.19.0',
51-
'pycryptodome>=3.7.2',
52-
'gevent>=1.3.7',
36+
'mechanicalsoup>=0.11.0,<0.12.0',
37+
'requests>=2.20.1,<3.0',
38+
'urllib3>=1.24.1,<2.0',
39+
'keyring>=17.0.0,<18.0',
40+
'lxml>=4.2.5,<5.0',
41+
'lz4>=2.1.2,<3.0',
42+
'pyexcel>=0.5.9.1,<0.6.0',
43+
'pyexcel-io>=0.5.10,<0.6.0',
44+
'pyexcel-ods3>=0.5.3,<0.6.0',
45+
'pyexcel-webio>=0.1.4,<0.2.0',
46+
'pyexcel-xls>=0.5.8,<0.6.0',
47+
'pyexcel-xlsx>=0.5.6,<0.6.0',
48+
'cookiecutter>=1.6.0,<2.0',
49+
'cssselect>=1.0.3,<2.0',
50+
'w3lib>=1.19.0,<2.0',
51+
'pycryptodome>=3.7.2,<4.0',
52+
'gevent>=1.3.7,<2.0',
5353

5454
]
5555

5656
test_requirements = [
57-
'pytest>=4.0.1',
58-
'pytest-cov==2.6.0',
59-
'coverage==4.5.2',
60-
'mock==2.0.0'
57+
'pytest>=4.0.1,<5.0',
58+
'pytest-cov==2.6.0,<3.0',
59+
'coverage==4.5.2,<5.0',
60+
'mock==2.0.0,<3.0'
6161
]
6262

6363
# What packages are optional?
@@ -124,7 +124,7 @@ def run(self):
124124
author_email=EMAIL,
125125
python_requires=REQUIRES_PYTHON,
126126
url=URL,
127-
download_url='https://github.com/bomquote/transistor/archive/v0.2.1.tar.gz',
127+
download_url='https://github.com/bomquote/transistor/archive/v0.2.2.tar.gz',
128128
keywords=['scraping', 'crawling', 'spiders', 'requests', 'beautifulsoup4',
129129
'mechanicalsoup', 'framework', 'headless-browser'],
130130
packages=find_packages(exclude=('tests',)),

0 commit comments

Comments
 (0)