Skip to content

Commit

Permalink
fix: psycopg2 testing
Browse files Browse the repository at this point in the history
feat: verified updated versions from version testing branch
  • Loading branch information
therightstuff committed Oct 5, 2023
1 parent a6d1f55 commit 7dfc748
Show file tree
Hide file tree
Showing 36 changed files with 290 additions and 78 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/push-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
architecture: x64
- run: |
# install dependencies for (some) psycopg2 builds
apt install python3-dev libpq-dev
- run: pip3 install -r requirements.txt
- run: python3 -m nox -e "${{ matrix.integration-test-family }}"

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/version-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- run: |
# install dependencies for (some) psycopg2 builds
apt install python3-dev libpq-dev
- run: pip3 install -r requirements.txt
- run: python3 -m nox
continue-on-error: true
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ Getting your machine ready to develop against the package is a straightforward p
1. Run the setup script: `python setup.py develop`.
1. Run `pre-commit install` in your repository to install pre-commit hooks

### MacOS Users
### Psycopg2 installation requirements for MacOS

Psycopg2 cannot be installed without the `pg_config` executable available, for which you'll need to install `postgres`.
`Psycopg2` cannot be installed without the `pg_config` executable available, for which you'll need to install `postgres`. For some versions of `Psycopg2`, `libpq` is also required.

You can do this with `brew update && brew install postgresql`.
You can do this with `brew update && brew install postgresql libpq`.

It might be necessary to throw in a `brew tap homebrew/core` along the way.

Expand Down
49 changes: 28 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,33 +206,40 @@ get_current_span().add_event('<error-message>', {'lumigo.type': '<error-type>'})
| Instrumentation | Package | Supported Versions | | | | |
| --- | --- | :---: | :---: | :---: | :---: | :---: |
| | | 3.7 | 3.8 | 3.9 | 3.10 | 3.11 |
| botocore | [boto3](https://pypi.org/project/boto3) | 1.17.22~1.28.40|1.17.22~1.28.40|1.17.22~1.28.40|1.17.22~1.28.40|1.17.22~1.28.40|
| django | [django](https://pypi.org/project/django) | 3.2.1~3.2.21|3.2.1~3.2.21|3.2.1~3.2.21|3.2.1~3.2.21|3.2.1~3.2.21|
| | | 3.2| 4.0.1~4.2.5| 4.0.1~4.2.5| 4.0.1~4.2.5| 4.0.1~4.2.5|
| | | | 3.2| 3.2| 3.2| 3.2|
| | | | 4.0| 4.0| 4.0| 4.0|
| | | | 4.0.a1| 4.0.a1| 4.0.a1| 4.0.a1|
| | | | 4.0.b1| 4.0.b1| 4.0.b1| 4.0.b1|
| | | | 4.0.rc1| 4.0.rc1| 4.0.rc1| 4.0.rc1|
| | | | 4.1| 4.1| 4.1| 4.1|
| | | | 4.1.a1| 4.1.a1| 4.1.a1| 4.1.a1|
| | | | 4.1.b1| 4.1.b1| 4.1.b1| 4.1.b1|
| | | | 4.1.rc1| 4.1.rc1| 4.1.rc1| 4.1.rc1|
| | | | 4.2| 4.2| 4.2| 4.2|
| | | | 4.2.a1| 4.2.a1| 4.2.a1| 4.2.a1|
| | | | 4.2.b1| 4.2.b1| 4.2.b1| 4.2.b1|
| | | | 4.2.rc1| 4.2.rc1| 4.2.rc1| 4.2.rc1|
| botocore | [boto3](https://pypi.org/project/boto3) | 1.17.22~1.28.60|1.17.22~1.28.60|1.17.22~1.28.60|1.17.22~1.28.60|1.17.22~1.28.60|
| django | [django](https://pypi.org/project/django) | 3.2.1~3.2.22|3.2.1~3.2.22|3.2.1~3.2.22|3.2.1~3.2.22|3.2.1~3.2.22|
| | | 3.2| 4.0.1~4.2.6| 4.0.1~4.2.6| 4.0.1~4.2.6| 4.0.1~4.2.6|
| | | | 3.2| 3.2| 5.0a1| 5.0a1|
| | | | 4.0| 4.0| 3.2| 3.2|
| | | | 4.0.a1| 4.0.a1| 4.0| 4.0|
| | | | 4.0.b1| 4.0.b1| 4.0.a1| 4.0.a1|
| | | | 4.0.rc1| 4.0.rc1| 4.0.b1| 4.0.b1|
| | | | 4.1| 4.1| 4.0.rc1| 4.0.rc1|
| | | | 4.1.a1| 4.1.a1| 4.1| 4.1|
| | | | 4.1.b1| 4.1.b1| 4.1.a1| 4.1.a1|
| | | | 4.1.rc1| 4.1.rc1| 4.1.b1| 4.1.b1|
| | | | 4.1rc1| 4.1rc1| 4.1.rc1| 4.1.rc1|
| | | | 4.2| 4.2| 4.1rc1| 4.1rc1|
| | | | 4.2.a1| 4.2.a1| 4.2| 4.2|
| | | | 4.2.b1| 4.2.b1| 4.2.a1| 4.2.a1|
| | | | 4.2.rc1| 4.2.rc1| 4.2.b1| 4.2.b1|
| | | | 4.2rc1| 4.2rc1| 4.2.rc1| 4.2.rc1|
| | | | | | 4.2rc1| 4.2rc1|
| fastapi | [fastapi](https://pypi.org/project/fastapi) | 0.56.1~0.100.0|0.56.1~0.100.0|0.56.1~0.100.0|0.56.1~0.100.0|0.56.1~0.100.0|
| | | 0.100.0b2~0.103.1| 0.100.0b2~0.103.1| 0.100.0b2~0.103.1| 0.100.0b2~0.103.1| 0.100.0b2~0.103.1|
| | | 0.100.0b2~0.103.2| 0.100.0b2~0.103.2| 0.100.0b2~0.103.2| 0.100.0b2~0.103.2| 0.100.0b2~0.103.2|
| | [uvicorn](https://pypi.org/project/uvicorn) | 0.11.3~0.22.0|0.11.3~0.22.0|0.11.3~0.22.0|0.11.3~0.22.0|0.12.0~0.22.0|
| flask | [flask](https://pypi.org/project/flask) | 2.0.0~2.2.5|2.0.0~2.2.5|2.0.0~2.2.5|2.0.0~2.2.5|2.0.0~2.2.5|
| grpcio | [grpcio](https://pypi.org/project/grpcio) | 1.45.0~1.58.0rc1|1.45.0~1.58.0rc1|1.45.0~1.58.0rc1|1.45.0~1.58.0rc1|1.49.0~1.58.0rc1|
| grpcio | [grpcio](https://pypi.org/project/grpcio) | 1.45.0~1.59.0rc1|1.45.0~1.59.0rc1|1.45.0~1.59.0rc1|1.45.0~1.59.0rc1|1.49.0~1.59.0rc1|
| kafka_python | [kafka_python](https://pypi.org/project/kafka_python) | 2.0.0~2.0.2|2.0.0~2.0.2|2.0.0~2.0.2|2.0.0~2.0.2|2.0.0~2.0.2|
| pika | [pika](https://pypi.org/project/pika) | 1.0.0|1.0.0|1.0.0|1.0.0|1.0.0|
| | | 1.0.1~1.3.0| 1.0.1~1.3.0| 1.0.1~1.3.0| 1.0.1~1.3.0| 1.0.1~1.3.0|
| | | 1.3.0rc5~1.3.2| 1.3.0rc5~1.3.2| 1.3.0rc5~1.3.2| 1.3.0rc5~1.3.2| 1.3.0rc5~1.3.2|
| psycopg2 | [psycopg2-binary](https://pypi.org/project/psycopg2-binary) | 2.9|2.9|2.9|2.9.5|2.9.5|
| | [psycopg2](https://pypi.org/project/psycopg2) | 2.9|2.9|2.9|2.9.5|2.9.5|
| psycopg2 | [psycopg2](https://pypi.org/project/psycopg2) | 2.7.5~2.9.9|2.8.1~2.9.9|2.8.1~2.9.9|2.8.1~2.8.6|2.9.5~2.9.9|
| | | 2.8| 2.8| 2.8| 2.9.5~2.9.9| |
| | | 2.9| 2.9| 2.9| 2.8| |
| | [psycopg2-binary](https://pypi.org/project/psycopg2-binary) | 2.7.5~2.9.9|2.8.1~2.9.9|2.8.1~2.9.9|2.8.1~2.8.6|2.9.5~2.9.9|
| | | 2.8| 2.8| 2.8| 2.9.5~2.9.9| |
| | | 2.9| 2.9| 2.9| 2.8| |
| pymongo | [pymongo](https://pypi.org/project/pymongo) | 3.1.1~3.3.1|3.1.1~3.3.1|3.1.1~3.3.1|3.1.1~3.3.1|3.1.1~3.3.1|
| | | 3.5.0~3.13.0| 3.5.0~3.13.0| 3.5.0~3.13.0| 3.5.0~3.13.0| 3.5.0~3.13.0|
| | | 4.0.1~4.5.0| 4.0.1~4.5.0| 4.0.1~4.5.0| 4.0.1~4.5.0| 4.0.1~4.5.0|
Expand All @@ -244,7 +251,7 @@ get_current_span().add_event('<error-message>', {'lumigo.type': '<error-type>'})
| | | 1.1.0~1.1.0rc2| 1.1.0~1.1.0rc2| 1.1.0~1.1.0rc2| 1.1.0~1.1.0rc2| 1.1.0~1.1.0rc2|
| redis | [redis](https://pypi.org/project/redis) | 4.1.1~4.2.0|4.1.1~4.2.0|4.1.1~4.2.0|4.1.1~4.2.0|4.1.1~4.2.0|
| | | 4.2.1~4.6.0| 4.2.1~4.6.0| 4.2.1~4.6.0| 4.2.1~4.6.0| 4.2.1~4.6.0|
| | | 5.0.0~5.0.0rc2| 5.0.0~5.0.0rc2| 5.0.0~5.0.0rc2| 5.0.0~5.0.0rc2| 5.0.0~5.0.0rc2|
| | | 5.0.0~5.0.1| 5.0.0~5.0.1| 5.0.0~5.0.1| 5.0.0~5.0.1| 5.0.0~5.0.1|

## Automated dependency reporting

Expand Down
2 changes: 2 additions & 0 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,8 @@ def integration_tests_flask(session, flask_version):
session.install("werkzeug==2.2.3")
else:
session.install("werkzeug==2.3.7")
if flask_version.startswith("3."):
session.install("werkzeug==3.0.0")

try:
session.run(
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ types-requests==2.28.11.2
types-setuptools==65.5.0.2
types-urllib3<1.27
typing_extensions==4.0.1
Werkzeug==2.0.2
zipp==3.8.0
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,23 @@
1.28.38
1.28.39
1.28.40
1.28.41
1.28.42
1.28.43
1.28.44
1.28.45
1.28.46
1.28.47
1.28.48
1.28.49
1.28.50
1.28.51
1.28.52
1.28.53
1.28.54
1.28.55
1.28.56
1.28.57
1.28.58
1.28.59
1.28.60
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,23 @@
1.28.38
1.28.39
1.28.40
1.28.41
1.28.42
1.28.43
1.28.44
1.28.45
1.28.46
1.28.47
1.28.48
1.28.49
1.28.50
1.28.51
1.28.52
1.28.53
1.28.54
1.28.55
1.28.56
1.28.57
1.28.58
1.28.59
1.28.60
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,23 @@
1.28.38
1.28.39
1.28.40
1.28.41
1.28.42
1.28.43
1.28.44
1.28.45
1.28.46
1.28.47
1.28.48
1.28.49
1.28.50
1.28.51
1.28.52
1.28.53
1.28.54
1.28.55
1.28.56
1.28.57
1.28.58
1.28.59
1.28.60
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,23 @@
1.28.38
1.28.39
1.28.40
1.28.41
1.28.42
1.28.43
1.28.44
1.28.45
1.28.46
1.28.47
1.28.48
1.28.49
1.28.50
1.28.51
1.28.52
1.28.53
1.28.54
1.28.55
1.28.56
1.28.57
1.28.58
1.28.59
1.28.60
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,23 @@
1.28.38
1.28.39
1.28.40
1.28.41
1.28.42
1.28.43
1.28.44
1.28.45
1.28.46
1.28.47
1.28.48
1.28.49
1.28.50
1.28.51
1.28.52
1.28.53
1.28.54
1.28.55
1.28.56
1.28.57
1.28.58
1.28.59
1.28.60
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
3.2
3.2.1
3.2.2
3.2.3
Expand All @@ -20,10 +19,7 @@
3.2.19
3.2.20
3.2.21
4.0.a1
4.0.b1
4.0.rc1
4.0
3.2.22
4.0.1
4.0.2
4.0.3
Expand All @@ -34,11 +30,8 @@
4.0.8
4.0.9
4.0.10
4.1.a1
4.1.b1
4.1.rc1
4.1
4.1.1
4.1b1
4.1.2
4.1.3
4.1.4
Expand All @@ -49,12 +42,28 @@
4.1.9
4.1.10
4.1.11
4.2.a1
4.2.b1
4.2.rc1
4.2
4.1.12
4.2.1
4.2a1
4.2b1
4.2.2
4.2.3
4.2.4
4.2.5
4.2.6
5.0a1
3.2
4.0
4.0.a1
4.0.b1
4.0.rc1
4.1
4.1.a1
4.1.b1
4.1.rc1
4.1rc1
4.2
4.2.a1
4.2.b1
4.2.rc1
4.2rc1
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
3.2
3.2.1
3.2.2
3.2.3
Expand All @@ -20,10 +19,7 @@
3.2.19
3.2.20
3.2.21
4.0.a1
4.0.b1
4.0.rc1
4.0
3.2.22
4.0.1
4.0.2
4.0.3
Expand All @@ -34,11 +30,8 @@
4.0.8
4.0.9
4.0.10
4.1.a1
4.1.b1
4.1.rc1
4.1
4.1.1
4.1b1
4.1.2
4.1.3
4.1.4
Expand All @@ -49,12 +42,28 @@
4.1.9
4.1.10
4.1.11
4.2.a1
4.2.b1
4.2.rc1
4.2
4.1.12
4.2.1
4.2b1
4.2a1
4.2.2
4.2.3
4.2.4
4.2.5
4.2.6
5.0a1
3.2
4.0
4.0.a1
4.0.b1
4.0.rc1
4.1
4.1.a1
4.1.b1
4.1.rc1
4.1rc1
4.2
4.2.a1
4.2.b1
4.2.rc1
4.2rc1
Loading

0 comments on commit 7dfc748

Please sign in to comment.