Skip to content

Commit

Permalink
Initial 0.14 aioamqp merge
Browse files Browse the repository at this point in the history
completely untested!
  • Loading branch information
smurfix committed Feb 11, 2020
2 parents 09ab687 + 54ade18 commit 33d7510
Show file tree
Hide file tree
Showing 35 changed files with 977 additions and 1,184 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,6 @@ docs/_build/
# editor stuffs
*.swp
/.pybuild

# Pycharm/IntelliJ
.idea/*
3 changes: 2 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ disable=
too-many-locals,
too-many-public-methods,
too-many-statements,
unused-argument
unused-argument,
wrong-import-order


[REPORTS]
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
language: python
dist: bionic
python:
- 3.5
- 3.6
- 3.7
- 3.8
services:
- rabbitmq
install:
Expand All @@ -21,4 +23,3 @@ before_script:
- ./rabbitmqadmin declare permission vhost=test user=guest read=".*" write=".*" configure=".*"
script:
- make test
- coverage
10 changes: 8 additions & 2 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
asyncamqp was originally created in early 2014 at Polyconseil.
asyncamqp was originally created as anyamqp in early 2014 at Polyconseil.

AUTHORS are (and/or have been)::

Expand All @@ -19,4 +19,10 @@ AUTHORS are (and/or have been)::
* Alexander Gromyko
* Nick Humrich
* Pavel Kamaev

* Mads Sejersen
* Dave Shawley
* Jacob Hagstedt P Suorra
* Matthias Urlichs
* Corey `notmeta`
* Paul Wistrand
* fullylegit
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM python:3.5

WORKDIR /usr/src/app

COPY . .

RUN pip install -r requirements_dev.txt
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ test:
update:
pip install -r ci/requirements_dev.txt

pylint:
pylint aioamqp


### semi-private targets used by polyconseil's CI (copy-pasted from blease) ###

Expand All @@ -47,9 +50,9 @@ reports:
mkdir -p reports

jenkins-test: reports
$(MAKE) test TEST_OPTIONS="--with-coverage --cover-package=$(PACKAGE) \
--cover-xml --cover-xml-file=reports/xmlcov.xml \
--with-xunit --xunit-file=reports/TEST-$(PACKAGE).xml \
$(MAKE) test TEST_OPTIONS="--cov=$(PACKAGE) \
--cov-report xml:reports/xmlcov.xml \
--junitxml=reports/TEST-$(PACKAGE).xml \
-v \
$(TEST_OPTIONS)"

Expand Down
5 changes: 5 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ Tests require an instance of RabbitMQ. You can start a new instance using docker
Then you can run the tests with ``make test`` (requires ``pytest``).


tests using docker-compose
^^^^^^^^^^^^^^^^^^^^^^^^^^
Start RabbitMQ using ``docker-compose up -d rabbitmq``. When RabbitMQ has started, start the tests using ``docker-compose up --build aioamqp-test``


Future work
-----------

Expand Down
Loading

0 comments on commit 33d7510

Please sign in to comment.