Skip to content

Commit f994df9

Browse files
author
schmide
committed
dependencies: fix erroneous setup.py
doc: fix erroneous '-' sign
1 parent f14bd6b commit f994df9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

doc/guide/git_flow.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ B) Push to remote branch (at least once/week, ideally daily)
195195

196196
C) Merge develop into your branch (regularly/when develop changes)
197197

198-
1. ``git fetch -all``
198+
1. ``git fetch --all``
199199
2. Make all commit according to A
200200
3. ``git status`` (verify that there are no tracked files that are
201201
uncommitted)
@@ -208,7 +208,7 @@ C) Merge develop into your branch (regularly/when develop changes)
208208

209209
D) Prepare to merge into develop (ideally before every release)
210210

211-
1. ``git fetch -all``
211+
1. ``git fetch --all``
212212
2. ``git checkout feature/feature_name``
213213
3. ``git status`` (see how many commits the branch is behind the
214214
remote)

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ def package_files(directory):
7575
'pandas-datareader==0.8.1',
7676
'pillow==7.2.0',
7777
'pint==0.15',
78-
'conda-forge::proj==7.0.0',
79-
'pytables==3.6.1',
78+
'proj==7.0.0',
79+
'tables==3.6.1',
8080
'rasterio==1.1.5',
8181
'scikit-learn==0.23.2',
8282
'statsmodels==0.11.1',

0 commit comments

Comments
 (0)