diff --git a/.github/workflows/python-integration.yml b/.github/workflows/python-integration.yml index 37a68d8a..7a2413ab 100644 --- a/.github/workflows/python-integration.yml +++ b/.github/workflows/python-integration.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.9] + python-version: ['3.9'] steps: - uses: actions/checkout@v2 @@ -29,8 +29,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install -r requirements/test.txt + python -m pip install --upgrade pip setuptools + python -m pip install -r requirements/test.txt - name: Start the Postgres service run: | docker compose -f postgres/docker-compose.yml up --build -d diff --git a/.github/workflows/python-package-daily.yml b/.github/workflows/python-package-daily.yml index 37cf4e85..f4723db2 100644 --- a/.github/workflows/python-package-daily.yml +++ b/.github/workflows/python-package-daily.yml @@ -24,9 +24,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - env: - VERSION: 3.38.1 - RELEASE: r1 run: | python -m pip install --upgrade pip setuptools python -m pip install -e '.[testing]' diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index a4458510..b1de05f3 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -25,9 +25,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - env: - VERSION: 3.38.1 - RELEASE: r1 run: | python -m pip install --upgrade pip setuptools python -m pip install -r requirements/test.txt diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0a5b99a6..97d39fb6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,15 +5,11 @@ Changelog Next ==== -Version 1.3.1 - 2024-10-08 -========================== - -- Add support for Python 3.12, drop support for 3.8 (#478) - -Version 1.3.0 - 2024-09-26 +Version 1.3.0 - 2024-10-08 ========================== - New Postgres backend based on multicorn2 (#397) +- Add support for Python 3.12, drop support for 3.8 (#478) Version 1.2.28 - 2024-09-11 =========================== diff --git a/README.rst b/README.rst index b36f614c..93b30234 100644 --- a/README.rst +++ b/README.rst @@ -52,7 +52,14 @@ And a command-line utility: $ shillelagh sql> SELECT * FROM a_table -There is also an `experimental backend `_ that uses Postgres with the `Multicorn2 `_ extension: +There is also an `experimental backend `_ that uses Postgres with the `Multicorn2 `_ extension. First, install the additional dependencies: + +.. code-block:: bash + + $ pip install 'shillelagh[multicorn]' + $ pip install 'multicorn @ git+https://github.com/pgsql-io/multicorn2.git@v2.5' + +Then run: .. code-block:: python @@ -66,6 +73,8 @@ There is also an `experimental backend =1.23.0 holidays>=0.23 html5lib>=1.1 - multicorn @ git+https://github.com/pgsql-io/multicorn2.git@v2.5 + # multicorn @ git+https://github.com/pgsql-io/multicorn2.git@v2.5 pandas>=1.2.2 pip-tools>=6.4.0 pre-commit>=2.13.0 @@ -113,7 +113,7 @@ all = google-auth>=1.23.0 holidays>=0.23 html5lib>=1.1 - multicorn @ git+https://github.com/pgsql-io/multicorn2.git@v2.5 + # multicorn @ git+https://github.com/pgsql-io/multicorn2.git@v2.5 pandas>=1.2.2 prison>=0.2.1 prompt_toolkit>=3 @@ -158,7 +158,7 @@ htmltableapi = html5lib>=1.1 pandas>=1.2.2 multicorn = - multicorn @ git+https://github.com/pgsql-io/multicorn2.git@v2.5 + # multicorn @ git+https://github.com/pgsql-io/multicorn2.git@v2.5 psycopg2-binary>=2.9.9 pandasmemory = pandas>=1.2.2