Skip to content

Commit d042e03

Browse files
authored
Merge branch 'master' into compose-file-fail-start
2 parents b7a9ecd + 6046ad6 commit d042e03

File tree

11 files changed

+447
-219
lines changed

11 files changed

+447
-219
lines changed

.github/workflows/main.yml

+4
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,7 @@ jobs:
7272
run: |
7373
py.test -svx --cov-config .coveragerc --cov-report html:skip-covered --cov-report term:skip-covered --cov=testcontainers --tb=short tests/test_${{ matrix.test-component }}
7474
codecov
75+
- name: Build package and check it
76+
run: |
77+
python setup.py bdist_wheel
78+
twine check dist/*

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ requirements : ${REQUIREMENTS}
1717

1818
${REQUIREMENTS} : requirements/%.txt : requirements.in setup.py
1919
mkdir -p $(dir $@)
20-
${RUN} -w /workspace -v `pwd`:/workspace python:$* bash -c \
21-
"pip install pip-tools && pip-compile -v --upgrade -o $@ $<"
20+
${RUN} -w /workspace -v `pwd`:/workspace --platform=linux/amd64 python:$* bash -c \
21+
"pip install pip-tools && pip-compile --resolver=backtracking -v --upgrade -o $@ $<"
2222

2323

2424
# Targets to build docker images

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ When trying to launch a testcontainer from within a Docker container two things
7373
Setting up a development environment
7474
------------------------------------
7575

76-
We recommend you use a `virtual environment <https://virtualenv.pypa.io/en/stable/>`_ for development. Note that a python version :code:`>=3.6` is required. After setting up your virtual environment, you can install all dependencies and test the installation by running the following snippet.
76+
We recommend you use a `virtual environment <https://virtualenv.pypa.io/en/stable/>`_ for development. Note that a python version :code:`>=3.7` is required. After setting up your virtual environment, you can install all dependencies and test the installation by running the following snippet.
7777

7878
.. code-block:: bash
7979

requirements.in

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ pg8000
66
pytest
77
pytest-cov
88
sphinx
9+
twine

0 commit comments

Comments
 (0)