Skip to content

Commit

Permalink
Merge branch 'master' into ahemani/issue_512
Browse files Browse the repository at this point in the history
  • Loading branch information
davidwagner committed Jun 13, 2022
2 parents 497050d + e372952 commit 6ed96ef
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 92 deletions.
25 changes: 23 additions & 2 deletions .github/workflows/run_tests.yml
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

# Note that miniconda is installed by default in environments
- name: Set up conda environment
Expand Down Expand Up @@ -48,4 +48,25 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# TODO: Add Docs deployment to run
- name: Push docs
if: github.ref_name == 'master' && github.event_name == 'push'
run: |
source activate datascience
python -m pip install -r docs/requirements.txt
python -m pip uninstall pandoc
conda install pandoc
git config --global user.name github-actions
git config --global user.email github-actions@github.com
echo "-- building docs --"
make docs
echo "-- pushing docs --"
rm -rf doc_build
git clone --quiet --branch=gh-pages $GITHUB_SERVER_URL/$GITHUB_REPOSITORY doc_build
cp -r docs/_build/html/* doc_build
cd doc_build
git add -A
git commit -m "Generated by commit $GITHUB_SHA, pushed by GitHub run $GITHUB_RUN_ID."
echo "-- try to push --"
git push "https://${{github.actor}}:${{github.token}}@github.com/${{github.repository}}.git"
rm -rf doc_build
5 changes: 4 additions & 1 deletion CHANGELOG.md
Expand Up @@ -4,9 +4,12 @@ All notable changes to this project will be documented in this file.

This project adheres to [Semantic Versioning](http://semver.org/).

### v0.17.3
### v0.17.4
* Changes maps.Circle's default line color from blue to the fill color, if it is defined.

### v0.17.3
* Remove many deprecation warnings.

### v0.17.2

* Remove test requirements from being installed all the time.
Expand Down
42 changes: 0 additions & 42 deletions DEVELOPERS.md
Expand Up @@ -59,48 +59,6 @@ locally, use these commands:
make docs # Generates docs inside doc/ folder
make serve_docs # Starts a local server to view docs

## Using Zenhub

We use [Zenhub](https://www.zenhub.io/) to organize development on this library.
To get started, go ahead and install the [Zenhub Chrome Extension][zenhub-extension].

[zenhub-extension]: https://chrome.google.com/webstore/detail/zenhub-for-github/ogcgkffhplmphkaahpmffcafajaocjbd?hl=en-US

Then navigate to [the issue board](#boards) or press `b`. You'll see a screen
that looks something like this:

![screenshot 2015-09-24 23 03 57](https://cloud.githubusercontent.com/assets/2468904/10094128/ddc05b92-6310-11e5-9a23-d51216370e89.png)

* **New Issues** are issues that are just created and haven't been prioritized.
* **Backlogged** issues are issues that are not high priority, like nice-to-have
features.
* **To Do** issues are high priority and should get done ASAP, such as
breaking bugs or functionality that we need to lecture on soon.
* Once someone has been assigned to an issue, that issue should be moved into
the **In Progress** column.
* When the task is complete, we close the related issue.

### Example Workflow

1. John creates an issue called "Everything is breaking". It goes into the New
Issues pipeline at first.
2. This issue is important, so John immediately moves it into the To Do
pipeline. Since he has to go lecture for 61A, he doesn't assign it to himself
right away.
3. Sam sees the issue, assigns himself to it, and moves it into the In Progress
pipeline.
4. After everything is fixed, Sam closes the issue.

Here's another example.

1. Ani creates an issue asking for beautiful histograms. Like before, it goes
into the New Issues pipeline.
2. John decides that the issue is not as high priority right now because other
things are breaking, so he moves it into the Backlog pipeline.
3. When he has some more time, John assigns himself the issue and moves it into
the In Progress pipeline.
4. Once the issue is finished, he closes the issue.

## Publishing

```
Expand Down
13 changes: 0 additions & 13 deletions Makefile
Expand Up @@ -27,16 +27,3 @@ clean_docs:

serve_docs:
cd $(DOCS_DIR)/_build/html ; python -m http.server

deploy_docs:
rm -rf doc_build

git clone --quiet --branch=gh-pages $(GH_REMOTE) doc_build
cp -r docs/_build/html/* doc_build

cd doc_build && \
git add -A && \
git commit -m "$(DEPLOY_DOCS_MESSAGE)" && \
git push -f $(GH_REMOTE) gh-pages

rm -rf doc_build
2 changes: 1 addition & 1 deletion datascience/tables.py
Expand Up @@ -5804,7 +5804,7 @@ def _vertical_x(axis, ticks=None, max_width=5):
if ticks is None:
ticks = axis.get_xticks()
if (np.array(ticks) == np.rint(ticks)).all():
ticks = np.rint(ticks).astype(np.int)
ticks = np.rint(ticks).astype(np.int64)
if max([len(str(tick)) for tick in ticks]) > max_width:
axis.set_xticklabels(ticks, rotation='vertical')

Expand Down
1 change: 1 addition & 0 deletions docs/tutorial.rst
Expand Up @@ -217,6 +217,7 @@ Operate on table data with :meth:`~datascience.tables.Table.sort`,
t.select(['count', 'points']).group('count', collect=sum)
.. ipython:: python
:okwarning:
other_table = Table().with_columns(
'mar_status', ['married', 'married', 'partner', 'partner', 'married'],
Expand Down
33 changes: 0 additions & 33 deletions tools/deploy_docs.sh

This file was deleted.

0 comments on commit 6ed96ef

Please sign in to comment.