From d0fb63a04749c41e097d75c24c7af5df3d11ad87 Mon Sep 17 00:00:00 2001 From: Betsy Lorton Date: Wed, 26 Sep 2018 11:50:13 -0400 Subject: [PATCH 1/2] Remove support for Django 1.8 --- README.md | 2 +- setup.py | 2 +- tox.ini | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7be0699..74bdcfc 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Tú puedes ver este app en español por poner `/es` al parte final del url. * [Bower](https://bower.io/) ### Code dependencies - * [Django 1.8-1.11](https://docs.djangoproject.com/en/1.11/) + * [Django 1.11](https://docs.djangoproject.com/en/1.11/) * [BeautifulSoup4](http://www.crummy.com/software/BeautifulSoup/bs4/doc/) * [Python-dateutil](https://dateutil.readthedocs.org/en/latest/) * [Requests](http://docs.python-requests.org/en/latest/) diff --git a/setup.py b/setup.py index 615bf97..a0cc473 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ install_requires = [ 'beautifulsoup4>=4.5.0,<4.7', - 'Django>=1.8,<1.12', + 'Django>=1.11,<1.12', 'dj-database-url>=0.4.2,<1', 'python-dateutil>=2.1<3', 'requests>=2.18,<3', diff --git a/tox.ini b/tox.ini index a30c0d3..7d4704b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist=True -envlist=py{27}-dj{18,111} +envlist=py{27}-dj{111} [testenv] install_command=pip install -e ".[testing]" -U {opts} {packages} @@ -10,5 +10,4 @@ commands= coverage report --skip-covered -m deps= - dj18: Django>=1.8,<1.9 dj111: Django>=1.11,<1.12 From 026395cb7a0a017ddf20404519d325d17e9e49e6 Mon Sep 17 00:00:00 2001 From: Betsy Lorton Date: Thu, 27 Sep 2018 14:23:49 -0400 Subject: [PATCH 2/2] Deprecate CHANGELOG in favor of Github releases The changelog was a manual process that was redudant to the Github release log. It was becoming out of date because it's easy to forget to update it. Before replacing the changelog with a deprecation message, I did a review to ensure that all information from the changelog also exists in the github release log. --- CHANGELOG.md | 209 +-------------------------------------------------- 1 file changed, 3 insertions(+), 206 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51b6d55..af9ccf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,208 +1,5 @@ -Notable changes to this project will be documented in this file. -We follow the [Semantic Versioning 2.0.0](http://semver.org/) format. +This project no longer uses `CHANGELOG.md` to track release changes. See the project repository release history at: https://github.com/cfpb/retirement/releases -## UNRELEASED +To see the legacy version of this file, visit: https://github.com/cfpb/retirement/blob/0.7.2/CHANGELOG.md -### Added -- - -### Changed -- Convert browserify config to webpack. -- Remove unused dependencies. -- Remove dependency on consumerfinance.gov in standalone mode. -- Remove header and footer in standalone mode. -- Update ESLint config to version 5. -- Fix linter errors. -- Convert to ES6 syntax. -- Minor code comment cleanup. -- Update test to test additional number formatting condition. -- Remove global install of snyk. - -### Removed -- - -## 0.6.1 -- Fix handling of Leap Day birthdays -- Used Snyk to walk through updating some dependencies with vulnerabilities -- Added `npm install -g snyk` to `frontendbuild.sh` to ensure `npm test` runs - -## 0.6.0 -- Update to frontend to gulp 4. -- Update linter to ESLint 4. -- Add rel attribute to links with target blank. -- Change from npm-shrinkwrap to package-lock. -- Remove gulp watch task. - -## 0.5.14 -- Removing MyRa references - -## 0.5.6 -- Add legal disclaimers in English and Spanish - -## 0.5.5 -- Regenerate shrinkwrap file to remove optional dependencies - -## 0.5.4 -- Fixed problem with leap-year dates -- Removed Google analytics code - -## 0.5.0 -- Updated the Django version to 1.8 -- Fixed HTML validation errors -- Removed calculate-age.js (unused) -- Removed delay.js (unused) -- Changed button text to the standard typeface (Avenir Next Medium) -- Added a custom management command for running SSA checks -- Changed initial interaction for steps 2 and 3 -- Updated the in step 3 to use cf-select styles -- Added error-handling and logging to ssa_check command -- Added front-end.md documentation file -- Added "claiming at" to the beginning of the graph text -- Fixed a Spanish translation error at the beginning of the graph text -- Updated Step 3 content and interactions for a planned claiming age of 70 -- Added "about this tool" page -- Added a manage.py script for checking Quick Calculator results -- Added a '--server' option for the check_ssa command - -## 0.4.7 -- Added lifetime calculations to api and removed from js -- Deleted unneeded grunt packages -- Added `.npmrc` and `npm-shrinkwrap.json` files -- Removed redundant cf-icon CSS code -- Pinned and shrinkwrapped NPM dependencies -- Added `snyk` to monitor for known NPM package vulnerabilities. - -## 0.4.62 -- Changed the url namespace for the 'about' page to be specific to retirement - -## 0.4.61 -- Blanked out `about` page content pending clearance -- Switched to `merge=union` for CHANGELOG.md in .gitattributes -- Fixed 'claiming at 68' phrasing error -- Fixed handling of birth dates on the first of a month -- Fixed error message for ages over 70 -- Translated date placeholders and explanatory text for folks past FRA -- Added urls, view and empty templates for 'about' pages in English and Spanish -- Added 'about' page content -- Fixed additional claiming phrasing errors -- Removed final references to raphael-min.js and fixed spinner direction -- Replaced custom slider with a standard range input -- Switched to a CFPB common navigation header -- Updated hero treatment and page spacing -- Added toggle link to switch between languages -- Added Calibration model to support SSA value checks -- Added ssa_check.py utility for monitoring SSA Quick Calculator values - -## 0.4.58 -- switch back to ssa.gov for our requests, after SSA started redirecting calls to socialsecurity.gov - -## 0.4.57 -- fix tests should they happen to run on leap day (Edgehog Day) - -## 0.4.56 -- fix prorating in edge cases - -## 0.4.53 -- fixed handling of edge case: display of age-62 graph bar when birth date = 1/2/1952 - -## 0.4.52 -- fixed outdated myRa link, English and Spanish - -## 0.4.51 -- fixed English and Spanish page titles to avoid using nonstandard pipe character - -## 0.4.5 -- Added switch for question graphics with English text on Spanish implementation - -## 0.4.4 -- fix for production speed issue -- adds navigation to match rest of site -- New wording order for hero -- Fix to graph explainer line ('Select claiming ages ...') -- Redirect for `/jubilacion/` (not in this repo, but in this release) -- Fix for api checker (randomizes parameters to avoid cache hits) -- Hero cactus shadow fixed - -## 0.4.3 -- hotfixes to fix Spanish content for testing - -## 0.4.1 -- hotfix for SSA's change to https - -## 0.4.0 -- completed Spanish implementation for user testing, adding translations for error messaging and javascript content -- bumped app's timeout to avoid caching of occasional slow SSA responses -- added front-end build script and setup.py code to invoke it (not used yet in deployments) -- added redirect to app's url config so it doesn't need to be handled in apache - -## 0.3.0 -- added a tooltip for those who claim early but keep working, in the 'sixties' question -- major overhaul to front-end code to integrate grunt tasks and npm -- addition of mocha tests and 'npm test' command - -## 0.2.0 -- changed title and `h1` to **Before you claim** -- made content changes based on user testing, including hiding the graph initially -- fixed mobile alignment of graph elements -- changed final url field to reflect new title - -## 0.1.7 -**2015-07-15** - -#### Fixed -- hotfix to make tool tips work in IE versions - -## 0.1.5 -**2015-07-14** - -#### Fixed -- mobile breakpoints for bar graph - -## 0.1.4 -**2015-07-14** - -#### Fixed -- Bugs and content issues for user testing - -## 0.1.3 -**2015-07-08 – soft launch for user testing** - -#### Fixed -- Static pathing for live site - -## 0.1.2 -**2015-07-08** - -#### Fixed -- Views for mobile devices - -## 0.1.1 -**2015-07-07** - -#### Added -- table migrations for models - -## 0.1.0 -**2015-07-07 – release to prep for deployment** - -#### Added -- Initial working graph, questions and interactions - -## 0.0.1 -**2015-04-06** - -#### Added -- Initial endpoints - -#### Deprecated -- Nothing - -#### Removed -- Nothing - -#### Fixed -- Nothing. +or, from the command line: `git show 0.7.2:CHANGELOG.md`