Skip to content

Commit

Permalink
Merge pull request #726 from HEPData/opensearch-v2.11.0
Browse files Browse the repository at this point in the history
ci/docs: upgrade from OpenSearch v2.7.0 to v2.11.0
  • Loading branch information
GraemeWatt authored Nov 6, 2023
2 parents bb089d0 + 3ed7652 commit a6983d5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

matrix:
postgres-version: [ 14 ]
os-version: [ '2.7.0' ]
os-version: [ '2.11.0' ]
python-version: [ '3.8', '3.9' ]
exclude:
- python-version: ${{ github.event.act && '3.8' }}
Expand Down
24 changes: 12 additions & 12 deletions INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,31 @@ for example, using ``yum`` or ``apt-get`` for Linux or ``brew`` for macOS:

* `PostgreSQL <http://www.postgresql.org/>`_ (version 14) database server
* `Redis <http://redis.io/>`_ for caching
* `OpenSearch <https://opensearch.org/>`_ (version 2.7.0) for indexing and information retrieval. See below for further instructions.
* `OpenSearch <https://opensearch.org/>`_ (version 2.11.0) for indexing and information retrieval. See below for further instructions.
* `Node.js <https://nodejs.org>`_ (version 18) JavaScript run-time environment and its package manager `npm <https://www.npmjs.com/>`_.

OpenSearch v2.7.0
-----------------
OpenSearch v2.11.0
------------------

We are currently using OpenSearch v2.7.0. Here, you can find the `download instructions. <https://opensearch.org/versions/opensearch-2-7-0.html>`_
We are currently using OpenSearch v2.11.0. Here, you can find the `download instructions. <https://opensearch.org/versions/opensearch-2-11-0.html>`_

There are some examples below:

**MacOS**

Install the latest version (currently, v2.8.0) with ``brew install opensearch``.
Alternatively, to install a specific version like v2.6.0 via Homebrew (v2.7.0 is unavailable), run:
Install the latest version (currently, v2.11.0) with ``brew install opensearch``.
Alternatively, to install a specific version like v2.11.0 via Homebrew (if the latest version is newer), run:

.. code-block:: console
$ brew tap-new opensearch/tap
$ brew extract --version=2.6.0 opensearch opensearch/tap
$ brew install opensearch/tap/opensearch@2.6.0
$ brew services restart opensearch/tap/opensearch@2.6.0
$ brew extract --version=2.11.0 opensearch opensearch/tap
$ brew install opensearch/tap/opensearch@2.11.0
$ brew services restart opensearch/tap/opensearch@2.11.0
**Linux**

You can see the tarball instructions on the OpenSearch installation `webpage. <https://opensearch.org/docs/2.2/opensearch/install/tar/>`_
You can see the tarball instructions on the OpenSearch installation `webpage. <https://opensearch.org/docs/2.11/install-and-configure/install-opensearch/tar/>`_

To execute, run this command within the extracted folder.

Expand All @@ -74,8 +74,8 @@ Alternatively, run OpenSearch after `installing Docker <https://docs.docker.com/

.. code-block:: console
$ docker pull opensearchproject/opensearch:2.7.0
$ docker run -d -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "plugins.security.disabled=true" opensearchproject/opensearch:2.7.0
$ docker pull opensearchproject/opensearch:2.11.0
$ docker run -d -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "plugins.security.disabled=true" opensearchproject/opensearch:2.11.0
.. _installation:

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ services:
- "5432:5432"
read_only: false
os:
image: opensearchproject/opensearch:2.7.0
image: opensearchproject/opensearch:2.11.0
read_only: false
environment:
- node.name=os01
Expand Down
2 changes: 1 addition & 1 deletion hepdata/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
and parsed by ``setup.py``.
"""

__version__ = "0.9.4dev20231101"
__version__ = "0.9.4dev20231106"

0 comments on commit a6983d5

Please sign in to comment.