Skip to content

Commit 2129cea

Browse files
authored
Document git flow (#56)
* Update references to hackathan repo to new name * Document git flow setup * Revise opening line in readme
1 parent 987ab7f commit 2129cea

File tree

3 files changed

+34
-16
lines changed

3 files changed

+34
-16
lines changed

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
Hey there!
55

6-
If you found your way here that probably means you are curious about how to contribute to this project. This is great! We are always looking for new contributors. If you can't find the information you are looking for in this document or anywhere else in the repo, please consider [opening a ticket](https://github.com/dh-tech/hackathon-2022/issues) so we know there is something we need to address.
6+
If you found your way here that probably means you are curious about how to contribute to this project. This is great! We are always looking for new contributors. If you can't find the information you are looking for in this document or anywhere else in the repo, please consider [opening a ticket](https://github.com/dh-tech/undate-python/issues) so we know there is something we need to address.
77

88
## Project Setup
99
Instructions on how to set up the project locally and how to run the tests can be found [in the Readme file](README.md).
@@ -12,7 +12,7 @@ Instructions on how to set up the project locally and how to run the tests can b
1212
If you would like to contribute by submitting bug fixes, improvements, or new features, please fork the repository and then make a pull request to our main branch when you are ready. For details see [this description of the Forking Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow).
1313

1414
## Submitting Bug Reports and Feature Requests
15-
If you find a bug or can think a feature you would really like to see being implemented, you can [create a new issue](https://github.com/dh-tech/hackathon-2022/issues). Please first look through the existing issues, however, to avoid duplication of issues.
15+
If you find a bug or can think a feature you would really like to see being implemented, you can [create a new issue](https://github.com/dh-tech/undate-python/issues). Please first look through the existing issues, however, to avoid duplication of issues.
1616

1717
If you report a bug, please include any error messages you get and a full description of the steps to reproduce the bug. For new feature requests, please clearly describe the functionality you are looking for and, if applicable, why any existing workflow does not suffice. Please also consider, fixing bugs and implementing new features yourself and submit pull request! :)
1818

README.md

+31-13
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
# hackathon-2022
1+
# undate-python
22

3-
Repository for the DHTech 2022 Hackathon
3+
`undate` is a python library for working with uncertain or partially known dates.
4+
5+
It was initially created as part of a DH-Tech hackathon in November 2022.
46

57
[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
6-
[![unit tests](https://github.com/dh-tech/hackathon-2022/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/dh-tech/hackathon-2022/actions/workflows/unit_tests.yml)
7-
[![codecov](https://codecov.io/gh/dh-tech/hackathon-2022/branch/main/graph/badge.svg?token=GE7HZE8C9D)](https://codecov.io/gh/dh-tech/hackathon-2022)
8+
[![unit tests](https://github.com/dh-tech/undate-python/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/dh-tech/undate-python/actions/workflows/unit_tests.yml)
9+
[![codecov](https://codecov.io/gh/dh-tech/undate-python/branch/main/graph/badge.svg?token=GE7HZE8C9D)](https://codecov.io/gh/dh-tech/undate-python)
810
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
911
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
1012
[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
@@ -18,22 +20,38 @@ This software is licensed under the [Apache 2.0 License](LICENSE.md).
1820

1921
To install the latest development version from GitHub:
2022
```sh
21-
pip install git+https://github.com/dh-tech/hackathon-2022.git@main#egg=undate
23+
pip install git+https://github.com/dh-tech/undate-python.git@main#egg=undate
2224
```
2325

2426
To install a specific release or branch, run the following (replace `[tag-name]` with the tag or branch you want to install):
2527
```sh
26-
pip install git+https://github.com/dh-tech/hackathon-2022.git@[tag-name]
28+
pip install git+https://github.com/dh-tech/undate-python.git@[tag-name]
2729
```
2830

2931
## Instructions to setup for development
3032

3133
### Clone repo
3234
```
33-
$ git clone [email protected]:dh-tech/hackathon-2022.git
34-
cd hackathon-2022
35+
$ git clone [email protected]:dh-tech/undate-python.git
36+
cd undate-python
3537
```
3638

39+
## Setup and initialize git flow
40+
41+
This repository uses [git-flow](https://github.com/nvie/gitflow) branching conventions:
42+
- **main** will always contain the most recent release
43+
- **develop** branch is the latest version of work in progress
44+
45+
Pull requests should be made against the **develop** branch.
46+
47+
It is recommended to install git flow (on OSX, use brew or ports, e.g.: `brew install git-flow`;
48+
on Ubuntu/Debian, `apt-get install git-flow`) and then initialize it in this repository
49+
via `git flow init` and accept the defaults. Then you can use `git flow feature start`
50+
to create feature development branches.
51+
52+
Alternately, you can check out the develop branch (`git checkout develop`)
53+
and create your branches manually based on develop (`git checkout -b feature/xxx-name`).
54+
3755
### Set up Python environment
3856
Use a recent version of python 3.x; recommended to use a virtualenv, e.g.
3957
```
@@ -55,7 +73,7 @@ pre-commit install
5573
```
5674

5775
### Run unit tests
58-
Tests can be run with either `tox` or `pytest`.
76+
Tests can be run with either `tox` or `pytest`.
5977

6078
To run all the tests in a single test file, use pytest and specify the path to the test: `pytest tests/test_dateformat/test_base.py`
6179

@@ -75,11 +93,11 @@ tox -e docs
7593
<table>
7694
<tbody>
7795
<tr>
78-
<td align="center"><a href="https://github.com/ColeDCrawford"><img src="https://avatars.githubusercontent.com/u/16374762?v=4?s=100" width="100px;" alt="Cole Crawford"/><br /><sub><b>Cole Crawford</b></sub></a><br /><a href="https://github.com/dh-tech/hackathon-2022/commits?author=ColeDCrawford" title="Code">💻</a> <a href="https://github.com/dh-tech/hackathon-2022/pulls?q=is%3Apr+reviewed-by%3AColeDCrawford" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/dh-tech/hackathon-2022/commits?author=ColeDCrawford" title="Tests">⚠️</a></td>
79-
<td align="center"><a href="http://rlskoeser.github.io"><img src="https://avatars.githubusercontent.com/u/691231?v=4?s=100" width="100px;" alt="Rebecca Sutton Koeser"/><br /><sub><b>Rebecca Sutton Koeser</b></sub></a><br /><a href="https://github.com/dh-tech/hackathon-2022/commits?author=rlskoeser" title="Code">💻</a> <a href="https://github.com/dh-tech/hackathon-2022/pulls?q=is%3Apr+reviewed-by%3Arlskoeser" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/dh-tech/hackathon-2022/commits?author=rlskoeser" title="Tests">⚠️</a></td>
96+
<td align="center"><a href="https://github.com/ColeDCrawford"><img src="https://avatars.githubusercontent.com/u/16374762?v=4?s=100" width="100px;" alt="Cole Crawford"/><br /><sub><b>Cole Crawford</b></sub></a><br /><a href="https://github.com/dh-tech/undate-python/commits?author=ColeDCrawford" title="Code">💻</a> <a href="https://github.com/dh-tech/undate-python/pulls?q=is%3Apr+reviewed-by%3AColeDCrawford" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/dh-tech/undate-python/commits?author=ColeDCrawford" title="Tests">⚠️</a></td>
97+
<td align="center"><a href="http://rlskoeser.github.io"><img src="https://avatars.githubusercontent.com/u/691231?v=4?s=100" width="100px;" alt="Rebecca Sutton Koeser"/><br /><sub><b>Rebecca Sutton Koeser</b></sub></a><br /><a href="https://github.com/dh-tech/undate-python/commits?author=rlskoeser" title="Code">💻</a> <a href="https://github.com/dh-tech/undate-python/pulls?q=is%3Apr+reviewed-by%3Arlskoeser" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/dh-tech/undate-python/commits?author=rlskoeser" title="Tests">⚠️</a></td>
8098
<td align="center"><a href="https://github.com/robcast"><img src="https://avatars.githubusercontent.com/u/1488847?v=4?s=100" width="100px;" alt="Robert Casties"/><br /><sub><b>Robert Casties</b></sub></a><br /><a href="#data-robcast" title="Data">🔣</a></td>
81-
<td align="center"><a href="https://github.com/jdamerow"><img src="https://avatars.githubusercontent.com/u/8881141?v=4?s=100" width="100px;" alt="Julia Damerow"/><br /><sub><b>Julia Damerow</b></sub></a><br /><a href="https://github.com/dh-tech/hackathon-2022/commits?author=jdamerow" title="Code">💻</a> <a href="https://github.com/dh-tech/hackathon-2022/pulls?q=is%3Apr+reviewed-by%3Ajdamerow" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/dh-tech/hackathon-2022/commits?author=jdamerow" title="Tests">⚠️</a> <a href="#eventOrganizing-jdamerow" title="Event Organizing">📋</a></td>
82-
<td align="center"><a href="https://github.com/maltevogl"><img src="https://avatars.githubusercontent.com/u/20907912?v=4?s=100" width="100px;" alt="Malte Vogl"/><br /><sub><b>Malte Vogl</b></sub></a><br /><a href="https://github.com/dh-tech/hackathon-2022/commits?author=maltevogl" title="Code">💻</a> <a href="https://github.com/dh-tech/hackathon-2022/pulls?q=is%3Apr+reviewed-by%3Amaltevogl" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/dh-tech/hackathon-2022/commits?author=maltevogl" title="Tests">⚠️</a> <a href="https://github.com/dh-tech/hackathon-2022/commits?author=maltevogl" title="Documentation">📖</a></td>
99+
<td align="center"><a href="https://github.com/jdamerow"><img src="https://avatars.githubusercontent.com/u/8881141?v=4?s=100" width="100px;" alt="Julia Damerow"/><br /><sub><b>Julia Damerow</b></sub></a><br /><a href="https://github.com/dh-tech/undate-python/commits?author=jdamerow" title="Code">💻</a> <a href="https://github.com/dh-tech/undate-python/pulls?q=is%3Apr+reviewed-by%3Ajdamerow" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/dh-tech/undate-python/commits?author=jdamerow" title="Tests">⚠️</a> <a href="#eventOrganizing-jdamerow" title="Event Organizing">📋</a></td>
100+
<td align="center"><a href="https://github.com/maltevogl"><img src="https://avatars.githubusercontent.com/u/20907912?v=4?s=100" width="100px;" alt="Malte Vogl"/><br /><sub><b>Malte Vogl</b></sub></a><br /><a href="https://github.com/dh-tech/undate-python/commits?author=maltevogl" title="Code">💻</a> <a href="https://github.com/dh-tech/undate-python/pulls?q=is%3Apr+reviewed-by%3Amaltevogl" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/dh-tech/undate-python/commits?author=maltevogl" title="Tests">⚠️</a> <a href="https://github.com/dh-tech/undate-python/commits?author=maltevogl" title="Documentation">📖</a></td>
83101
</tr>
84102
</tbody>
85103
</table>

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ long_description_content_type = text/markdown
1111
url = https://github.com/dh-tech/hackathon-2022
1212
project_urls =
1313
Project Home = https://dh-tech.github.io
14-
Bug Tracker = https://github.com/dh-tech/hackathon-2022/-/issues
14+
Bug Tracker = https://github.com/dh-tech/undate-python/issues
1515
classifiers =
1616
Development Status :: 2 - Pre-Alpha
1717
Programming Language :: Python :: 3

0 commit comments

Comments
 (0)