Skip to content

Commit

Permalink
broken Makefile bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
casperdcl committed Nov 7, 2015
1 parent 3981915 commit f54e371
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 17 deletions.
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# IMPORTANT: for compatibility with `python setup.py make [alias]`, ensure:
# 1. Every alias is preceded by @make (eg: @make alias)
# 2. Add a line return after every @make alias (ie, cannot put multiple alias calls on one line)
# 3. One command per line
# 4. Every line shifts is using TABs and not SPACEs
# 2. A maximum of one @make alias or command per line
#
# Sample makefile compatible with `python setup.py make`:
#```
Expand Down Expand Up @@ -68,7 +66,7 @@ install:
build:
python -c "import shutil; shutil.rmtree('build', True)"
python -c "import shutil; shutil.rmtree('dist', True)"
python -c "import shutil; shutil.rmtree('tqdm.egg-info', True)"
python -c "import shutil; shutil.rmtree('tqdm.egg-info', True)"
python setup.py sdist --formats=gztar,zip bdist_wininst
python setup.py sdist bdist_wheel

Expand Down
15 changes: 3 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,7 @@
def parse_makefile_aliases(filepath):
'''
Parse a makefile to find commands and substitute variables. Expects a
makefile with only aliases and a line return between each command, i.e.:
```
all:
test
install
test:
nosetest
install:
python setup.py install
```
makefile with only aliases and a line return between each command.
Returns a dict, with a list of commands for each alias.
'''
Expand Down Expand Up @@ -106,7 +96,8 @@ def parse_makefile_aliases(filepath):
def execute_makefile_commands(commands, alias, verbose=False):
cmds = commands[alias]
for cmd in cmds:
# Parse string in a shell-like fashion using shlex (allows to easily parse quoted strings and comments)
# Parse string in a shell-like fashion
# (incl quoted strings and comments)
parsed_cmd = shlex.split(cmd, comments=True)
# Execute command if not empty (ie, not just a comment)
if parsed_cmd:
Expand Down
2 changes: 1 addition & 1 deletion tqdm/_version.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Definition of the version number
version_info = 2, 2, 3 # major, minor, patch, -extra
version_info = 2, 2, 4 # major, minor, patch, -extra

# Nice string for the version
__version__ = '.'.join(map(str, version_info)).replace('.-', '-').strip('.-')

0 comments on commit f54e371

Please sign in to comment.