Skip to content

Commit

Permalink
Merge pull request #2124 from martinholmer/0-23-1
Browse files Browse the repository at this point in the history
Update RELEASES.md for forthcoming release 0.23.1
  • Loading branch information
martinholmer committed Nov 20, 2018
2 parents eac11c0 + 167c675 commit c079b88
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 34 deletions.
29 changes: 26 additions & 3 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,32 @@ Go [here](https://github.com/open-source-economics/Tax-Calculator/pulls?q=is%3Ap
for a complete commit history.


2018-11-20 Release 0.23.1
-------------------------
(last merged pull request is
[#2123](https://github.com/open-source-economics/Tax-Calculator/pull/2123))

**API Changes**
- None

**New Features**
- None

**Bug Fixes**
- Replace buggy Parameters.default_data() with Policy.metadata() method
[[#2119](https://github.com/open-source-economics/Tax-Calculator/pull/2119)
by Martin Holmer with bug reported by Hank Doupe]
- Add ability to pass Pandas DataFrame as the `adjust_ratios` argument to Records class constructor
[[#2121](https://github.com/open-source-economics/Tax-Calculator/pull/2121)
by Martin Holmer with bug reported by Anderson Frailey]
- Revise Cookbook recipe 1 to show easier way to access reform files on website
[[#2122](https://github.com/open-source-economics/Tax-Calculator/pull/2122)
by Martin Holmer]


_Earlier Releases:_


2018-11-13 Release 0.23.0
-------------------------
(last merged pull request is
Expand Down Expand Up @@ -32,9 +58,6 @@ for a complete commit history.
- None


_Earlier Releases:_


2018-10-26 Release 0.22.2
-------------------------
(last merged pull request is
Expand Down
38 changes: 20 additions & 18 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,37 @@ RELEASING TAX-CALCULATOR CONDA PACKAGES
=======================================

```
... on branch X-Y-Z, edit RELEASES.md to finalize X.Y.Z info
--> on branch X-Y-Z, edit RELEASES.md to finalize X.Y.Z info
... merge master branch into X-Y-Z branch
--> merge master branch into X-Y-Z branch
... edit "version = 'X.Y.Z'" in read-the-docs/source/conf.py
--> edit "version = 'X.Y.Z'" in read-the-docs/source/conf.py
... run `make pytest-all` [or `pytest -m pre_release -n4` in taxcalc]
--> run `make pytest-all` [or `pytest -m pre_release -n4` in taxcalc]
... run `make package` [so that tc CLI is available]
--> run `make package` [to make taxcalc package available in docs]
... cd docs/cookbook ; python test_recipes.py ; .fix. ; python make_cookbook.py
--> run `conda install -c PSLmodels behresp --yes` [to make behresp available]
... cd .. ; ./index_results.sh ; .fix.
--> cd docs/cookbook ; python test_recipes.py ; .fix. ; python make_cookbook.py
... edit "What's New" section of index.htmx ; python make_index.py
--> cd .. ; ./index_results.sh ; .fix.
... cd .. ; make clean [to remove local taxcalc package]
--> edit "What's New" section of index.htmx ; python make_index.py
... commit X-Y-Z branch and push to origin
--> cd .. ; make clean [to remove taxcalc and behresp packages]
... merge X-Y-Z branch into master branch on GitHub
--> commit X-Y-Z branch and push to origin
... on local master branch, ./gitsync
--> merge X-Y-Z branch into master branch on GitHub
... create release X.Y.Z on GitHub using master branch
--> on local master branch, ./gitsync
... create packages using `pbrelease Tax-Calculator taxcalc X.Y.Z` command
--> create release X.Y.Z on GitHub using master branch
... email policybrain-modelers list about the new release and packages
--> create packages using `pbrelease Tax-Calculator taxcalc X.Y.Z` command
--> email policybrain-modelers list about the new release and packages
```

LATER: create new X-Y-Z branch that will hold RELEASES.md info for next release
Expand All @@ -51,13 +53,13 @@ $ git checkout master
$ git checkout -b 1-4-1 1.4.0
... fix bug on branch 1-4-1, test, commit bug fix
--> fix bug on branch 1-4-1, test, commit bug fix
$ git push upstream 1-4-1
... create release 1.4.1 using GitHub releases GUI citing branch 1-4-1
--> create release 1.4.1 using GitHub releases GUI citing branch 1-4-1
... then in order to merge bug-fix into master branch and future releases
--> then in order to merge bug-fix into master branch and future releases
beginning with 1.5.0, do the following:
$ git checkout master
Expand Down

0 comments on commit c079b88

Please sign in to comment.