Skip to content

Commit

Permalink
Merge 36655d2 into 43163be
Browse files Browse the repository at this point in the history
  • Loading branch information
vitorararuna committed Jul 30, 2021
2 parents 43163be + 36655d2 commit 6058144
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ See the merges policy in the topic [Merges to **main**](CONTRIBUTING.md#merges-t

### **development**

The **development** branch is where the work of the other branches will be unified and where a stable version will be created to merge with **main**.
The **dev** branch is where the work of the other branches will be unified and where a stable version will be created to merge with **main**.
Like **main** it is blocked for commits and pushs.
See the merges policy in the topic [Merges for development] (CONTRIBUTING.md#merges-for-development) merges to **development** </a>.
See the merges policy in the topic [Merges for dev] (CONTRIBUTING.md#merges-for-development) merges to **dev** </a>.

### Branch name

The feature development branches will be created from the **development** branch with the default nomenclature `change_name`.
The feature development branches will be created from the **dev** branch with the default nomenclature `change_name`.

## Commits Policy

Expand Down Expand Up @@ -75,7 +75,7 @@ HOTFIX Updating project contribution guide

### Pull Requests

Pull requests must be made to the **development** branch following the rules and steps in the topic [**Merges**](CONTRIBUTING.md#merges). In the pull request content there should be a clear description of what was done.
Pull requests must be made to the **dev** branch following the rules and steps in the topic [**Merges**](CONTRIBUTING.md#merges). In the pull request content there should be a clear description of what was done.


#### Work in Progress
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If you have any questions you can also contact us by creating an issue or by ask

### Installation

To run the project environment, access our [installation guide](INSTALLATION.md).
To run the project environment, access our [installation guide](https://dodfminer.readthedocs.io/en/stable/user/install.html).

### Documentation

Expand Down
20 changes: 10 additions & 10 deletions docs/source/user/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ Following are the list of avaiable parameters, their description and the default
Parameters Table
^^^^^^^^^^^^^^^^

+------------------+-----------------------------------------+---------+
| Argument | Description | Default |
+==================+=========================================+=========+
| -sp --save_path | Folder to output the download DODFs | ./ |
+------------------+-----------------------------------------+---------+
| -sd --start_date | Input the date in either mm/yy or mm-yy | 01/19 |
+------------------+-----------------------------------------+---------+
| -ed --end_date | Input the date in either mm/yy or mm-yy | 01/19 |
+------------------+-----------------------------------------+---------+
+------------------+---------------------------------------------+---------+
| Argument | Description | Default |
+==================+=============================================+=========+
| -sp --save_path | Folder to output the download DODFs | ./ |
+------------------+---------------------------------------------+---------+
| -sd --start_date | Input the date in either mm/yyyy or mm-yyyy | 01/2019 |
+------------------+---------------------------------------------+---------+
| -ed --end_date | Input the date in either mm/yyyy or mm-yyyy | 01/2019 |
+------------------+---------------------------------------------+---------+

Usage Example::

$ dodfminer downloader -sd 01/03 -ed 12/20
$ dodfminer downloader -sd 01/2003 -ed 05/2004

Extractor Module
----------------
Expand Down
4 changes: 2 additions & 2 deletions dodfminer/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ def _download_parser(self):
default=self.save_path, type=str,
help=help_text)

help_text = 'Input the date in either mm/yy or mm-yy.'
help_text = 'Input the date in either mm/yyyy or mm-yyyy.'
self.download_parser.add_argument('-sd', '--start_date', dest='start_date',
default=self.def_start_date, type=str,
help=help_text)

help_text = 'Input the date in either mm/yy or mm-yy.'
help_text = 'Input the date in either mm/yyyy or mm-yyyy.'
self.download_parser.add_argument('-ed', '--end_date', dest='end_date',
default=self.def_end_date, type=str,
help=help_text)
Expand Down
6 changes: 3 additions & 3 deletions dodfminer/downloader/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def _string_to_date(self, date):
elif '-' in date:
date = datetime.strptime(date, '%m-%Y').date()
else:
msg = 'start_date or end_date must be in format mm/yy or mm-yyyy'
msg = 'start_date or end_date must be in format mm/yyyy or mm-yyyy'
raise Exception(msg)

return date
Expand Down Expand Up @@ -181,8 +181,8 @@ def pull(self, start_date, end_date):
The Pdfs are saved in a folder called "data" inside the project folder.
Args:
start_date (str): The start date in format mm/yy.
end_date (str): The start date in format mm/yy.
start_date (str): The start date in format mm/yyyy.
end_date (str): The start date in format mm/yyyy.
Note:
The name or the path of the save folder are hard coded and can't
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ certifi==2020.4.5.2
chardet==3.0.4
idna==2.9
numpy==1.18.5
pandas==1.0.4
pandas==1.3.0
PyMuPDF==1.17.0
python-dateutil==2.8.1
pytz==2020.1
Expand Down

0 comments on commit 6058144

Please sign in to comment.