Skip to content

Commit

Permalink
Bumped version to 1.11.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
Justin Littman committed Oct 23, 2017
1 parent 7f40629 commit ed5e2d7
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.10.0
current_version = 1.11.0

[bumpversion:file:docs/conf.py]

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# built documents.
#
# The full version, including alpha/beta/rc tags.
release = '1.10.0'
release = '1.11.0'
# The short X.Y version.
version = release[0:release.rindex(".")]

Expand Down
24 changes: 12 additions & 12 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.0 with the correct version.
git checkout 1.10.0
# Replace 1.11.0 with the correct version.
git checkout 1.11.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.10.0 with the correct version)::
or just download ``example.prod.docker-compose.yml`` and ``example.env`` (replacing 1.11.0 with the correct version)::

curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.10.0/example.prod.docker-compose.yml > docker-compose.yml
curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.10.0/example.env > .env
curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.11.0/example.prod.docker-compose.yml > docker-compose.yml
curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.11.0/example.env > .env

2. Update configuration in ``.env`` as described in :ref:`install-configuration`.

Expand Down Expand Up @@ -70,7 +70,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.10.0*::
statements change *master* to the correct version, e.g., *1.11.0*::

#cloud-config
repo_update: true
Expand All @@ -87,8 +87,8 @@ statements change *master* to the correct version, e.g., *1.10.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.10.0/example.prod.docker-compose.yml > docker-compose.yml
- curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.10.0/example.env > .env
- curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.11.0/example.prod.docker-compose.yml > docker-compose.yml
- curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.11.0/example.env > .env
# Set config below by uncommenting.
# Don't forget to escape $ as \$.
# COMMON CONFIGURATION
Expand Down Expand Up @@ -243,13 +243,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.10.0 with the correct version.
git checkout 1.10.0
# Replace 1.11.0 with the correct version.
git checkout 1.11.0
cp example.prod.docker-compose.yml docker-compose.yml

otherwise, replacing 1.10.0 with the correct version::
otherwise, replacing 1.11.0 with the correct version::

curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.10.0/example.prod.docker-compose.yml > docker-compose.yml
curl -L https://raw.githubusercontent.com/gwu-libraries/sfm-docker/1.11.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``.
Expand Down
2 changes: 1 addition & 1 deletion requirements/release.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
git+https://github.com/gwu-libraries/sfm-utils.git@1.10.0#egg=sfmutils
git+https://github.com/gwu-libraries/sfm-utils.git@1.11.0#egg=sfmutils
2 changes: 1 addition & 1 deletion sfm/sfm/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
SERIALIZE_HOUR = env.get('SFM_SERIALIZE_HOUR', '3')
SERIALIZE_MINUTE = env.get('SFM_SERIALIZE_MINUTE', '0')

SFM_UI_VERSION = "1.10.0"
SFM_UI_VERSION = "1.11.0"

# If a collection is schedules for <= PRIORITY_SCHEDULE_MINUTES,
# the routing key will have .priority appended.
Expand Down

0 comments on commit ed5e2d7

Please sign in to comment.