diff --git a/deploy.sh b/deploy.sh index 32dff8f1d..63d2d0c68 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,7 +7,7 @@ export GIT_PAGER=cat # Abort when user not sure. if [ $? -ne 0 ]; then - echo "[!] pre-deployment: user aborted or script failed" + echo "[!] Halted in pre-deployment: Either user ABORTED or script FAILED" exit; fi diff --git a/docs/changelog.rst b/docs/changelog.rst index b7eb3806d..e0f79f45d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -17,6 +17,19 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin - `About upgrading `_. +v1.5.1 - 2017-01-04 +^^^^^^^^^^^^^^^^^^^ + +.. note:: + + This patch contains no new features and **only solves upgrading issues** for some users. + + +**Tickets resolved in this release:** + +- Fix for issues `#200 `_ & `#217 `_, which is caused by omitting the switch to the VirtualEnv. This was not documented well enough in early versions of this project, causing failed upgrades. + + v1.5.0 - 2017-01-01 ^^^^^^^^^^^^^^^^^^^ diff --git a/docs/locale/nl/LC_MESSAGES/changelog.mo b/docs/locale/nl/LC_MESSAGES/changelog.mo index ad33284c6..fad99a195 100644 Binary files a/docs/locale/nl/LC_MESSAGES/changelog.mo and b/docs/locale/nl/LC_MESSAGES/changelog.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/changelog.po b/docs/locale/nl/LC_MESSAGES/changelog.po index a96518c91..3ffb97381 100644 --- a/docs/locale/nl/LC_MESSAGES/changelog.po +++ b/docs/locale/nl/LC_MESSAGES/changelog.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: DSMR Reader v1.x\n" "Report-Msgid-Bugs-To: Dennis Siemensma \n" -"POT-Creation-Date: 2016-01-01 00:00+0100\n" -"PO-Revision-Date: 2017-01-01 00:00+0100\n" +"POT-Creation-Date: 2017-01-04 19:34+0100\n" +"PO-Revision-Date: 2017-01-04 19:37+0100\n" "Last-Translator: Dennis Siemensma \n" "Language-Team: Dennis Siemensma \n" "MIME-Version: 1.0\n" @@ -57,14 +57,48 @@ msgstr "" "html#application-updates-bug-fixes-new-features>`_." #: ../../changelog.rst:21 -msgid "v1.5.0 - 2017-01-xx" +msgid "v1.5.1 - 2017-01-04" msgstr "" -#: ../../changelog.rst:23 ../../changelog.rst:65 +#: ../../changelog.rst:25 +msgid "" +"This patch contains no new features and **only solves upgrading issues** " +"for some users." +msgstr "" +"Deze patch bevat geen nieuwe features en **lost alleen upgrade-problemen " +"op** voor sommige gebruikers." + +#: ../../changelog.rst:28 ../../changelog.rst:46 ../../changelog.rst:70 +#: ../../changelog.rst:82 ../../changelog.rst:96 ../../changelog.rst:103 +#: ../../changelog.rst:113 ../../changelog.rst:124 ../../changelog.rst:140 +#: ../../changelog.rst:147 ../../changelog.rst:154 ../../changelog.rst:167 +msgid "**Tickets resolved in this release:**" +msgstr "**Tickets die opgelost zijn in deze release:**" + +#: ../../changelog.rst:30 +msgid "" +"Fix for issues `#200 `_ & `#217 `_, which is caused by omitting the switch to the VirtualEnv. " +"This was not documented well enough in early versions of this project, " +"causing failed upgrades." +msgstr "" +"Oplossing voor tickets `#200 `_ & `#217 `_, welke veroorzaakt worden door het niet wisselen " +"naar de VirtualEnv voor de upgrade. In eerdere versies van de project-" +"documentatie stond dit niet duidelijk genoeg beschreven en dat " +"veroorzaakt deze problemen." + +#: ../../changelog.rst:34 +msgid "v1.5.0 - 2017-01-01" +msgstr "" + +#: ../../changelog.rst:36 ../../changelog.rst:78 msgid "**Change in Python support**" msgstr "**Wijziging in Python-ondersteuning**" -#: ../../changelog.rst:25 +#: ../../changelog.rst:38 msgid "" "The support for ``Python 3.3`` has been **dropped** due to the Django " "upgrade (`#103 `_)." -#: ../../changelog.rst:26 +#: ../../changelog.rst:39 msgid "" "There is **experimental support** for ``Python 3.6`` and ``Python 3.7 " "(nightly)`` as the unittests are `now built against those versions " @@ -87,11 +121,11 @@ msgstr "" "branches>`_ (`#167 `_)." -#: ../../changelog.rst:28 +#: ../../changelog.rst:41 msgid "**Legacy warning**" msgstr "**Waarschuwing voor legacy**" -#: ../../changelog.rst:30 +#: ../../changelog.rst:43 msgid "" "The migrations that were squashed together in (`#31 `_) have been **removed**. This " @@ -103,7 +137,7 @@ msgstr "" "je alleen maar te maken wanneer je nog gebruik maakt van een dsmrreader-" "versie **vóór** ``v0.13 (β)``." -#: ../../changelog.rst:31 +#: ../../changelog.rst:44 msgid "" "If you are indeed still running ``< v0.13 (β)``, please upgrade to " "``v1.4`` first (!), followed by an upgrade to ``v1.5``." @@ -112,416 +146,409 @@ msgstr "" "upgrade dan eerst naar ``v1.4`` (!), gevolgd door een upgrade naar " "``v1.5``." -#: ../../changelog.rst:33 ../../changelog.rst:57 ../../changelog.rst:69 -#: ../../changelog.rst:83 ../../changelog.rst:90 ../../changelog.rst:100 -#: ../../changelog.rst:111 ../../changelog.rst:127 ../../changelog.rst:134 -#: ../../changelog.rst:141 ../../changelog.rst:154 -msgid "**Tickets resolved in this release:**" -msgstr "**Tickets die opgelost zijn in deze release:**" - -#: ../../changelog.rst:35 +#: ../../changelog.rst:48 msgid "" "Verify telegrams' CRC (`#188 `_)." msgstr "" -#: ../../changelog.rst:36 +#: ../../changelog.rst:49 msgid "" "Display last 24 hours on dashboard (`#164 `_)." msgstr "" -#: ../../changelog.rst:37 +#: ../../changelog.rst:50 msgid "" "Status page visualisation (`#172 `_)." msgstr "" -#: ../../changelog.rst:38 +#: ../../changelog.rst:51 msgid "" "Store and display phases consumption (`#161 `_)." msgstr "" -#: ../../changelog.rst:39 +#: ../../changelog.rst:52 msgid "" "Weather graph not showing when no gas data is available (`#170 `_)." msgstr "" -#: ../../changelog.rst:40 +#: ../../changelog.rst:53 msgid "" "Upgrade to ChartJs 2.0 (`#127 `_)." msgstr "" -#: ../../changelog.rst:41 +#: ../../changelog.rst:54 msgid "" "Improve Statistics page performance (`#173 `_)." msgstr "" -#: ../../changelog.rst:42 +#: ../../changelog.rst:55 msgid "" "Version checker at github (`#166 `_)." msgstr "" -#: ../../changelog.rst:43 +#: ../../changelog.rst:56 msgid "" "Remove required login for dismissal of in-app notifications (`#179 " "`_)." msgstr "" -#: ../../changelog.rst:44 +#: ../../changelog.rst:57 msgid "" "Round numbers displayed in GUI to 2 decimals (`#183 `_)." msgstr "" -#: ../../changelog.rst:45 +#: ../../changelog.rst:58 msgid "" "Switch Nosetests to Pytest (+ pytest-cov) (`#167 `_)." msgstr "" -#: ../../changelog.rst:46 +#: ../../changelog.rst:59 msgid "" "PyLama code audit (+ pytest-cov) (`#158 `_)." msgstr "" -#: ../../changelog.rst:47 +#: ../../changelog.rst:60 msgid "" "Double upgrade of Django framework ``Django 1.8`` -> ``Django 1.9`` -> " "``Django 1.10`` (`#103 `_)." msgstr "" -#: ../../changelog.rst:48 +#: ../../changelog.rst:61 msgid "" "Force ``PYTHONUNBUFFERED`` for supervisor commands (`#176 `_)." msgstr "" -#: ../../changelog.rst:49 +#: ../../changelog.rst:62 msgid "" "Documentation updates for v1.5 (`#171 `_)." msgstr "" -#: ../../changelog.rst:50 +#: ../../changelog.rst:63 msgid "" "Requirements update for v1.5 (december 2016) (`#182 `_)." msgstr "" -#: ../../changelog.rst:51 +#: ../../changelog.rst:64 msgid "" "Improved backend process logging (`#184 `_)." msgstr "" -#: ../../changelog.rst:55 +#: ../../changelog.rst:68 msgid "v1.4.1 - 2016-12-12" msgstr "" -#: ../../changelog.rst:59 +#: ../../changelog.rst:72 msgid "" "Consumption chart hangs due to unique_key violation (`#174 `_)." msgstr "" -#: ../../changelog.rst:60 +#: ../../changelog.rst:73 msgid "" "NoReverseMatch at / Reverse for 'docs' (`#175 `_)." msgstr "" -#: ../../changelog.rst:64 +#: ../../changelog.rst:77 msgid "v1.4.0 - 2016-11-28" msgstr "" -#: ../../changelog.rst:67 +#: ../../changelog.rst:80 msgid "" "Support for ``Python 3.5`` has been added officially (`#55 `_)." msgstr "" -#: ../../changelog.rst:71 +#: ../../changelog.rst:84 msgid "" "Push notifications for Notify My Android / Prowl (iOS), written by " "Jeroen Peters (`#152 `_)." msgstr "" -#: ../../changelog.rst:72 +#: ../../changelog.rst:85 msgid "" "Support for both single and high/low tariff (`#130 `_)." msgstr "" -#: ../../changelog.rst:73 +#: ../../changelog.rst:86 msgid "" "Add new note from Dashboard has wrong time format (`#159 `_)." msgstr "" -#: ../../changelog.rst:74 +#: ../../changelog.rst:87 msgid "" "Display estimated price for current usage in Dashboard (`#155 `_)." msgstr "" -#: ../../changelog.rst:75 +#: ../../changelog.rst:88 msgid "" "Dropbox API v1 deprecated in June 2017 (`#142 `_)." msgstr "" -#: ../../changelog.rst:76 +#: ../../changelog.rst:89 msgid "" "Improve code coverage (`#151 `_)." msgstr "" -#: ../../changelog.rst:77 +#: ../../changelog.rst:90 msgid "" "Restyle configuration overview (`#156 `_)." msgstr "" -#: ../../changelog.rst:78 +#: ../../changelog.rst:91 msgid "" "Capability based push notifications (`#165 `_)." msgstr "" -#: ../../changelog.rst:82 +#: ../../changelog.rst:95 msgid "v1.3.2 - 2016-11-08" msgstr "" -#: ../../changelog.rst:85 +#: ../../changelog.rst:98 msgid "" "Requirements update (november 2016) (`#150 `_)." msgstr "" -#: ../../changelog.rst:89 +#: ../../changelog.rst:102 msgid "v1.3.1 - 2016-08-16" msgstr "" -#: ../../changelog.rst:92 +#: ../../changelog.rst:105 msgid "" "CSS large margin-bottom (`#144 `_)." msgstr "" -#: ../../changelog.rst:93 +#: ../../changelog.rst:106 msgid "" "Django security releases issued: 1.8.14 (`#147 `_)." msgstr "" -#: ../../changelog.rst:94 +#: ../../changelog.rst:107 msgid "" "Requirements update (August 2016) (`#148 `_)." msgstr "" -#: ../../changelog.rst:95 +#: ../../changelog.rst:108 msgid "" "Query performance improvements (`#149 `_)." msgstr "" -#: ../../changelog.rst:99 +#: ../../changelog.rst:112 msgid "v1.3.0 - 2016-07-15" msgstr "" -#: ../../changelog.rst:102 +#: ../../changelog.rst:115 msgid "" "API endpoint for datalogger (`#140 `_)." msgstr "" -#: ../../changelog.rst:103 +#: ../../changelog.rst:116 msgid "" "Colors for charts (`#137 `_)." msgstr "" -#: ../../changelog.rst:104 +#: ../../changelog.rst:117 msgid "" "Data export: Mindergas.nl (`#10 `_)." msgstr "" -#: ../../changelog.rst:105 +#: ../../changelog.rst:118 msgid "" "Requirement upgrade (`#143 `_)." msgstr "" -#: ../../changelog.rst:106 +#: ../../changelog.rst:119 msgid "" "Installation wizard for first time use (`#139 `_)." msgstr "" -#: ../../changelog.rst:110 +#: ../../changelog.rst:123 msgid "v1.2.0 - 2016-05-18" msgstr "" -#: ../../changelog.rst:113 +#: ../../changelog.rst:126 msgid "" "Energy supplier prices does not indicate tariff type (Django admin) " "(`#126 `_)." msgstr "" -#: ../../changelog.rst:114 +#: ../../changelog.rst:127 msgid "" "Requirements update (`#128 `_)." msgstr "" -#: ../../changelog.rst:115 +#: ../../changelog.rst:128 msgid "" "Force backup (`#123 `_)." msgstr "" -#: ../../changelog.rst:116 +#: ../../changelog.rst:129 msgid "" "Update clean-install.md (`#131 `_)." msgstr "" -#: ../../changelog.rst:117 +#: ../../changelog.rst:130 msgid "" "Improve data export field names (`#132 `_)." msgstr "" -#: ../../changelog.rst:118 +#: ../../changelog.rst:131 msgid "" "Display average temperature in archive (`#122 `_)." msgstr "" -#: ../../changelog.rst:119 +#: ../../changelog.rst:132 msgid "" "Pie charts on trends page overlap their canvas (`#136 `_)." msgstr "" -#: ../../changelog.rst:120 +#: ../../changelog.rst:133 msgid "" "'Slumber' consumption (`#115 `_)." msgstr "" -#: ../../changelog.rst:121 +#: ../../changelog.rst:134 msgid "" "Show lowest & highest Watt peaks (`#138 `_)." msgstr "" -#: ../../changelog.rst:122 +#: ../../changelog.rst:135 msgid "" "Allow day & hour statistics reset due to changing energy prices (`#95 " "`_)." msgstr "" -#: ../../changelog.rst:126 +#: ../../changelog.rst:139 msgid "v1.1.2 - 2016-05-01" msgstr "" -#: ../../changelog.rst:129 +#: ../../changelog.rst:142 msgid "" "Trends page giving errors (when lacking data) (`#125 `_)." msgstr "" -#: ../../changelog.rst:133 +#: ../../changelog.rst:146 msgid "v1.1.1 - 2016-04-27" msgstr "" -#: ../../changelog.rst:136 +#: ../../changelog.rst:149 msgid "" "Improve readme (`#124 `_)." msgstr "" -#: ../../changelog.rst:140 +#: ../../changelog.rst:153 msgid "v1.1.0 - 2016-04-23" msgstr "" -#: ../../changelog.rst:143 +#: ../../changelog.rst:156 msgid "" "Autorefresh dashboard (`#117 `_)." msgstr "" -#: ../../changelog.rst:144 +#: ../../changelog.rst:157 msgid "" "Improve line graphs' visibility (`#111 `_)." msgstr "" -#: ../../changelog.rst:145 +#: ../../changelog.rst:158 msgid "" "Easily add notes (`#110 `_)." msgstr "" -#: ../../changelog.rst:146 +#: ../../changelog.rst:159 msgid "" "Export data points in CSV format (`#2 `_)." msgstr "" -#: ../../changelog.rst:147 +#: ../../changelog.rst:160 msgid "" "Allow day/month/year comparison (`#94 `_)." msgstr "" -#: ../../changelog.rst:148 +#: ../../changelog.rst:161 msgid "" "Docs: Add FAQ and generic application info (`#113 `_)." msgstr "" -#: ../../changelog.rst:149 +#: ../../changelog.rst:162 msgid "" "Support for Iskra meter (DSMR 2.x) (`#120 `_)." msgstr "" -#: ../../changelog.rst:153 +#: ../../changelog.rst:166 msgid "v1.0.1 - 2016-04-07" msgstr "" -#: ../../changelog.rst:156 +#: ../../changelog.rst:169 msgid "" "Update licence to OSI compatible one (`#119 `_)." msgstr "" -#: ../../changelog.rst:160 +#: ../../changelog.rst:173 msgid "v1.0.0 - 2016-04-07" msgstr "" -#: ../../changelog.rst:161 +#: ../../changelog.rst:174 msgid "First official stable release." msgstr "Eerste officiële stabiele release." -#: ../../changelog.rst:165 +#: ../../changelog.rst:178 msgid "[β] v0.1 (2015-10-29) to 0.16 (2016-04-06)" msgstr "" -#: ../../changelog.rst:168 +#: ../../changelog.rst:181 msgid "" "All previous beta releases/changes have been combined to a single list " "below." @@ -529,442 +556,442 @@ msgstr "" "Alle vorige bèta releases/veranderingen zijn gecombineerd tot een enkele " "lijst hieronder." -#: ../../changelog.rst:170 +#: ../../changelog.rst:183 msgid "" "Move documentation to wiki or RTD (`#90 `_)." msgstr "" -#: ../../changelog.rst:171 +#: ../../changelog.rst:184 msgid "" "Translate README to Dutch (`#16 `_)." msgstr "" -#: ../../changelog.rst:172 +#: ../../changelog.rst:185 msgid "" "Delete (recent) history page (`#112 `_)." msgstr "" -#: ../../changelog.rst:173 +#: ../../changelog.rst:186 msgid "" "Display most recent temperature in dashboard (`#114 `_)." msgstr "" -#: ../../changelog.rst:174 +#: ../../changelog.rst:187 msgid "" "Upgrade Django to 1.8.12 (`#118 `_)." msgstr "" -#: ../../changelog.rst:176 +#: ../../changelog.rst:189 msgid "" "Redesign trends page (`#97 `_)." msgstr "" -#: ../../changelog.rst:177 +#: ../../changelog.rst:190 msgid "" "Support for summer time (`#105 `_)." msgstr "" -#: ../../changelog.rst:178 +#: ../../changelog.rst:191 msgid "" "Support for Daylight Saving Time (DST) transition (`#104 `_)." msgstr "" -#: ../../changelog.rst:179 +#: ../../changelog.rst:192 msgid "" "Add (error) hints to status page (`#106 `_)." msgstr "" -#: ../../changelog.rst:180 +#: ../../changelog.rst:193 msgid "" "Keep track of version (`#108 `_)." msgstr "" -#: ../../changelog.rst:182 +#: ../../changelog.rst:195 msgid "" "Django 1.8.11 released (`#82 `_)." msgstr "" -#: ../../changelog.rst:183 +#: ../../changelog.rst:196 msgid "" "Prevent tests from failing due to moment of execution (`#88 `_)." msgstr "" -#: ../../changelog.rst:184 +#: ../../changelog.rst:197 msgid "" "Statistics page meter positions are broken (`#93 `_)." msgstr "" -#: ../../changelog.rst:185 +#: ../../changelog.rst:198 msgid "" "Archive only shows graph untill 23:00 (11 pm) (`#77 `_)." msgstr "" -#: ../../changelog.rst:186 +#: ../../changelog.rst:199 msgid "" "Trends page crashes due to nullable fields average (`#100 `_)." msgstr "" -#: ../../changelog.rst:187 +#: ../../changelog.rst:200 msgid "" "Trends: Plot peak and off-peak relative to each other (`#99 `_)." msgstr "" -#: ../../changelog.rst:188 +#: ../../changelog.rst:201 msgid "" "Monitor requirements with requires.io (`#101 `_)." msgstr "" -#: ../../changelog.rst:189 +#: ../../changelog.rst:202 msgid "" "Terminology (`#41 `_)." msgstr "" -#: ../../changelog.rst:190 +#: ../../changelog.rst:203 msgid "" "Obsolete signals in dsmr_consumption (`#63 `_)." msgstr "" -#: ../../changelog.rst:191 +#: ../../changelog.rst:204 msgid "" "Individual app testing coverage (`#64 `_)." msgstr "" -#: ../../changelog.rst:192 +#: ../../changelog.rst:205 msgid "" "Support for extra devices on other M-bus (0-n:24.1) (`#92 `_)." msgstr "" -#: ../../changelog.rst:193 +#: ../../changelog.rst:206 msgid "" "Separate post-deployment commands (`#102 `_)." msgstr "" -#: ../../changelog.rst:195 +#: ../../changelog.rst:208 msgid "" "Show exceptions in production (webinterface) (`#87 `_)." msgstr "" -#: ../../changelog.rst:196 +#: ../../changelog.rst:209 msgid "" "Keep Supervisor processes running (`#79 `_)." msgstr "" -#: ../../changelog.rst:197 +#: ../../changelog.rst:210 msgid "" "Hourly stats of 22:00:00+00 every day lack gas (`#78 `_)." msgstr "" -#: ../../changelog.rst:198 +#: ../../changelog.rst:211 msgid "" "Test Travis-CI with MySQL + MariaDB + PostgreSQL (`#54 `_)." msgstr "" -#: ../../changelog.rst:199 +#: ../../changelog.rst:212 msgid "" "PostgreSQL tests + nosetests + coverage failure: unrecognized " "configuration parameter \"foreign_key_checks\" (`#62 `_)." msgstr "" -#: ../../changelog.rst:200 +#: ../../changelog.rst:213 msgid "" "Performance check (`#83 `_)." msgstr "" -#: ../../changelog.rst:201 +#: ../../changelog.rst:214 msgid "" "Allow month & year archive (`#66 `_)." msgstr "" -#: ../../changelog.rst:202 +#: ../../changelog.rst:215 msgid "" "Graphs keep increasing height on tablet (`#89 `_)." msgstr "" -#: ../../changelog.rst:204 +#: ../../changelog.rst:217 msgid "" "Delete StatsSettings(.track) settings model (`#71 `_)." msgstr "" -#: ../../changelog.rst:205 +#: ../../changelog.rst:218 msgid "" "Drop deprecated commands (`#22 `_)." msgstr "" -#: ../../changelog.rst:206 +#: ../../changelog.rst:219 msgid "" "Datalogger doesn't work properly with DSMR 4.2 (KAIFA-METER) (`#73 " "`_)." msgstr "" -#: ../../changelog.rst:207 +#: ../../changelog.rst:220 msgid "" "Dashboard month statistics costs does not add up (`#75 `_)." msgstr "" -#: ../../changelog.rst:208 +#: ../../changelog.rst:221 msgid "" "Log unhandled exceptions and errors (`#65 `_)." msgstr "" -#: ../../changelog.rst:209 +#: ../../changelog.rst:222 msgid "" "Datalogger crashes with IntegrityError because 'timestamp' is null (`#74 " "`_)." msgstr "" -#: ../../changelog.rst:210 +#: ../../changelog.rst:223 msgid "" "Trends are always shown in UTC (`#76 `_)." msgstr "" -#: ../../changelog.rst:211 +#: ../../changelog.rst:224 msgid "" "Squash migrations (`#31 `_)." msgstr "" -#: ../../changelog.rst:212 +#: ../../changelog.rst:225 msgid "" "Display 'electricity returned' graph in dashboard (`#81 `_)." msgstr "" -#: ../../changelog.rst:213 +#: ../../changelog.rst:226 msgid "" "Optional gas (and electricity returned) capabilities tracking (`#70 " "`_)." msgstr "" -#: ../../changelog.rst:214 +#: ../../changelog.rst:227 msgid "" "Add 'electricity returned' to trends page (`#84 `_)." msgstr "" -#: ../../changelog.rst:216 +#: ../../changelog.rst:229 msgid "" "Archive: View past days details (`#61 `_)." msgstr "" -#: ../../changelog.rst:217 +#: ../../changelog.rst:230 msgid "" "Dashboard: Consumption total for current month (`#60 `_)." msgstr "" -#: ../../changelog.rst:218 +#: ../../changelog.rst:231 msgid "" "Check whether gas readings are optional (`#34 `_)." msgstr "" -#: ../../changelog.rst:219 +#: ../../changelog.rst:232 msgid "" "Django security releases issued: 1.8.10 (`#68 `_)." msgstr "" -#: ../../changelog.rst:220 +#: ../../changelog.rst:233 msgid "" "Notes display in archive (`#69 `_)." msgstr "" -#: ../../changelog.rst:222 +#: ../../changelog.rst:235 msgid "" "Status page/alerts when features are disabled/unavailable (`#45 `_)." msgstr "" -#: ../../changelog.rst:223 +#: ../../changelog.rst:236 msgid "" "Integrate Travis CI (`#48 `_)." msgstr "" -#: ../../changelog.rst:224 +#: ../../changelog.rst:237 msgid "" "Testing coverage (`#38 `_)." msgstr "" -#: ../../changelog.rst:225 +#: ../../changelog.rst:238 msgid "" "Implement automatic backups & Dropbox cloud storage (`#44 `_)." msgstr "" -#: ../../changelog.rst:226 +#: ../../changelog.rst:239 msgid "" "Link code coverage service to repository (`#56 `_)." msgstr "" -#: ../../changelog.rst:227 +#: ../../changelog.rst:240 msgid "" "Explore timezone.localtime() as replacement for datetime.astimezone() " "(`#50 `_)." msgstr "" -#: ../../changelog.rst:228 +#: ../../changelog.rst:241 msgid "" "Align GasConsumption.read_at to represent the start of hour (`#40 " "`_)." msgstr "" -#: ../../changelog.rst:230 +#: ../../changelog.rst:243 msgid "" "Cleanup unused static files (`#47 `_)." msgstr "" -#: ../../changelog.rst:231 +#: ../../changelog.rst:244 msgid "" "Investigated mysql_tzinfo_to_sql — Load the Time Zone Tables (`#35 " "`_)." msgstr "" -#: ../../changelog.rst:232 +#: ../../changelog.rst:245 msgid "" "Make additional DSMR data optional (`#46 `_)." msgstr "" -#: ../../changelog.rst:233 +#: ../../changelog.rst:246 msgid "" "Localize graph x-axis (`#42 `_)." msgstr "" -#: ../../changelog.rst:234 +#: ../../changelog.rst:247 msgid "" "Added graph formatting string to gettext file (`#42 `_)." msgstr "" -#: ../../changelog.rst:235 +#: ../../changelog.rst:248 msgid "" "Different colors for peak & off-peak electricity (`#52 `_)." msgstr "" -#: ../../changelog.rst:236 +#: ../../changelog.rst:249 msgid "" "Admin: Note widget (`#51 `_)." msgstr "" -#: ../../changelog.rst:237 +#: ../../changelog.rst:250 msgid "" "Allow GUI to run without data (`#26 `_)." msgstr "" -#: ../../changelog.rst:239 +#: ../../changelog.rst:252 msgid "" "Moved project to GitHub (`#28 `_)." msgstr "" -#: ../../changelog.rst:240 +#: ../../changelog.rst:253 msgid "Added stdout to dsmr_backend to reflect progress." msgstr "" -#: ../../changelog.rst:241 +#: ../../changelog.rst:254 msgid "" "Restore note usage in GUI (`#39 `_)." msgstr "" -#: ../../changelog.rst:243 +#: ../../changelog.rst:256 msgid "" "Store daily, weekly, monthly and yearly statistics (`#3 `_)." msgstr "" -#: ../../changelog.rst:244 +#: ../../changelog.rst:257 msgid "" "Improved Recent History page performance a bit. (as result of `#3 " "`_)" msgstr "" -#: ../../changelog.rst:245 +#: ../../changelog.rst:258 msgid "" "Updates ChartJS library tot 1.1, disposing django-chartjs plugin. Labels " "finally work! (as result of `#3 `_)" msgstr "" -#: ../../changelog.rst:246 +#: ../../changelog.rst:259 msgid "" "Added trends page. (as result of `#3 `_)" msgstr "" -#: ../../changelog.rst:248 +#: ../../changelog.rst:261 msgid "" "Recent history setting: set range (`#29 `_)." msgstr "" -#: ../../changelog.rst:249 +#: ../../changelog.rst:262 msgid "" "Mock required for test: dsmr_weather.test_weather_tracking (`#32 " "`_)." msgstr "" -#: ../../changelog.rst:251 +#: ../../changelog.rst:264 msgid "" "Massive refactoring: Separating apps & using signals (`#19 `_)." msgstr "" -#: ../../changelog.rst:252 +#: ../../changelog.rst:265 msgid "" "README update: Exit character for cu (`#27 `_, by Jeroen Peters)." msgstr "" -#: ../../changelog.rst:253 +#: ../../changelog.rst:266 msgid "Fixed untranslated strings in admin interface." msgstr "" -#: ../../changelog.rst:254 +#: ../../changelog.rst:267 msgid "Upgraded Django to 1.8.9." msgstr "" diff --git a/dsmr_backend/tests/test_services.py b/dsmr_backend/tests/test_services.py index 95717167a..40a2c67a7 100644 --- a/dsmr_backend/tests/test_services.py +++ b/dsmr_backend/tests/test_services.py @@ -172,7 +172,7 @@ class TestIslatestVersion(TestCase): b"__version__ = get_version(VERSION)\n" response_newer = b"from django.utils.version import get_version\n" \ - b"VERSION = (1, 5, 1, 'final', 0)\n" \ + b"VERSION = (1, 25, 1, 'final', 0)\n" \ b"__version__ = get_version(VERSION)\n" def test_true(self, request_mock): diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py index 12815d321..8fb36d385 100644 --- a/dsmrreader/__init__.py +++ b/dsmrreader/__init__.py @@ -17,6 +17,6 @@ from django.utils.version import get_version -VERSION = (1, 5, 0, 'final', 0) +VERSION = (1, 5, 1, 'final', 0) __version__ = get_version(VERSION) diff --git a/post-deploy.sh b/post-deploy.sh index 4c71ecaa5..b41d7f09e 100755 --- a/post-deploy.sh +++ b/post-deploy.sh @@ -1,5 +1,21 @@ #!/bin/bash +echo "" +echo "" +echo " --- Checking whether VirtualEnv is activated." +python -c 'import sys; exit_code = 0 if hasattr(sys, "real_prefix") else 1; sys.exit(exit_code);' + +if [ $? -ne 0 ]; then + echo " [i] ----- Activating 'dsmrreader' VirtualEnv..." + source ~/.virtualenvs/dsmrreader/bin/activate + + if [ $? -ne 0 ]; then + echo " [!] FAILED to switch to 'dsmrreader' VirtualEnv (is it installed?)" + exit; + fi +fi + + echo "" echo "" echo " --- Checking & synchronizing base requirements for changes." diff --git a/pre-deploy.sh b/pre-deploy.sh index dceedc4a4..04ed07dd4 100755 --- a/pre-deploy.sh +++ b/pre-deploy.sh @@ -5,6 +5,14 @@ echo "" echo " --- You are currently running version: " python -c 'import dsmrreader ; print(dsmrreader.__version__)' +if [ $? -ne 0 ]; then + echo "" + echo " [!] FAILED to call Django (did you activate the 'dsmrreader' VirtualEnv before running?)" + echo "" + exit 1; +fi + + echo "" echo "" echo " Please make sure you've read EACH release note BEFORE deploying, since some"