From d5ca60cfad26bd47d226051b80d4daebe325748a Mon Sep 17 00:00:00 2001 From: Justin Littman Date: Wed, 10 May 2017 07:17:29 -0400 Subject: [PATCH] Bumped version to 1.8. --- .bumpversion.cfg | 2 +- docs/conf.py | 2 +- docs/install.rst | 24 ++++++++++++------------ requirements/release.txt | 2 +- sfm/sfm/settings/common.py | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 440b1799..635fa934 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.7.0 +current_version = 1.8.0 [bumpversion:file:docs/conf.py] diff --git a/docs/conf.py b/docs/conf.py index 0ed6415d..30aa4644 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,7 +55,7 @@ # built documents. # # The full version, including alpha/beta/rc tags. -release = '1.7.0' +release = '1.8.0' # The short X.Y version. version = release[0:release.rindex(".")] diff --git a/docs/install.rst b/docs/install.rst index cc97c25c..2b4ca6a7 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -33,15 +33,15 @@ Installing locally requires Docker and Docker-Compose. See :ref:`docker-installi git clone https://github.com/gwu-libraries/sfm-docker.git cd sfm-docker - # Replace 1.7.0 with the correct version. - git checkout 1.7.0 + # Replace 1.8.0 with the correct version. + git checkout 1.8.0 cp example.prod.docker-compose.yml docker-compose.yml cp example.env .env -or just download ``example.prod.docker-compose.yml`` and ``example.env`` (replacing 1.7.0 with the correct version):: +or just download ``example.prod.docker-compose.yml`` and ``example.env`` (replacing 1.8.0 with the correct version):: - curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.7.0/example.prod.docker-compose.yml > docker-compose.yml - curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.7.0/example.env > .env + curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.8.0/example.prod.docker-compose.yml > docker-compose.yml + curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.8.0/example.env > .env 2. Update configuration in ``.env`` as described in :ref:`install-configuration`. @@ -68,7 +68,7 @@ Notes: To launch an Amazon EC2 instance running SFM, follow the normal procedure for launching an instance. In *Step 3: Configure Instance Details*, under *Advanced Details* paste the following in user details and modify as appropriate as described in :ref:`install-configuration`. Also, in the curl -statements change *master* to the correct version, e.g., *1.7.0*:: +statements change *master* to the correct version, e.g., *1.8.0*:: #cloud-config repo_update: true @@ -85,8 +85,8 @@ statements change *master* to the correct version, e.g., *1.7.0*:: - mkdir /sfm-processing - cd /home/ubuntu # This brings up the latest production release. To bring up master, remove prod. - - curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.7.0/example.prod.docker-compose.yml > docker-compose.yml - - curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.7.0/example.env > .env + - curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.8.0/example.prod.docker-compose.yml > docker-compose.yml + - curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.8.0/example.env > .env # Set config below by uncommenting. # Don't forget to escape $ as \$. # COMMON CONFIGURATION @@ -225,13 +225,13 @@ This may take several minutes. 3. Get the latest ``example.prod.docker-compose.yml``. If you previously cloned the sfm-docker repository then:: git pull - # Replace 1.7.0 with the correct version. - git checkout 1.7.0 + # Replace 1.8.0 with the correct version. + git checkout 1.8.0 cp example.prod.docker-compose.yml docker-compose.yml -otherwise, replacing 1.7.0 with the correct version:: +otherwise, replacing 1.8.0 with the correct version:: - curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.7.0/example.prod.docker-compose.yml > docker-compose.yml + curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.8.0/example.prod.docker-compose.yml > docker-compose.yml 4. If you customized your previous ``docker-compose.yml`` file (e.g., for SFM ELK containers), make the same changes in your new ``docker-compose.yml``. diff --git a/requirements/release.txt b/requirements/release.txt index 1643be4e..f37bedbf 100644 --- a/requirements/release.txt +++ b/requirements/release.txt @@ -1 +1 @@ -git+https://github.com/gwu-libraries/sfm-utils.git@1.7.0#egg=sfmutils +git+https://github.com/gwu-libraries/sfm-utils.git@1.8.0#egg=sfmutils diff --git a/sfm/sfm/settings/common.py b/sfm/sfm/settings/common.py index 075b5846..681eb40a 100644 --- a/sfm/sfm/settings/common.py +++ b/sfm/sfm/settings/common.py @@ -247,4 +247,4 @@ SERIALIZE_HOUR = env.get('SFM_SERIALIZE_HOUR', '3') SERIALIZE_MINUTE = env.get('SFM_SERIALIZE_MINUTE', '0') -SFM_UI_VERSION = "1.7.0" +SFM_UI_VERSION = "1.8.0"