Skip to content

Commit

Permalink
Add LICENSE to setup.py and fix PGroup concat method
Browse files Browse the repository at this point in the history
  • Loading branch information
Qirky committed Aug 3, 2019
1 parent 2311cc3 commit c0603d2
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 10 deletions.
29 changes: 21 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,43 @@ FoxDot/lib/Settings/conf.txt
FoxDot/lib/Workspace/tmp/tempfile.txt
changed_files.txt

# To-do list

# Sphinx build dir
docs/_build/

*.txt

# To-do list
TODO.txt

# Tracks
FoxDot/Tracks/*

# Make directory and autodoc scripts


autodoc.py

snd/mkdir.py



# PIP Registration file


.pypirc


# Directory created by pip install -e


/*.egg-info



# Compiled Python file


*.pyc

# Sphinx build dir
docs/_build/

*.txt

# Windows image file caches
Thumbs.db
ehthumbs.db
Expand Down
2 changes: 1 addition & 1 deletion FoxDot/lib/.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.34
0.7.35
16 changes: 16 additions & 0 deletions FoxDot/lib/Patterns/Main.py
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,22 @@ def flatten(self):
values.append(item)
return PGroup(values)

def concat(self, data):
""" Concatonates this patterns stream with another """
new = PGroup()
if isinstance(data, PGroup):
new.data = self.data + data.data
# Creates a pattern
elif isinstance(data, Pattern):
new = PGroup(*self.data, data)
elif isinstance(data, (list, str)):
new.data = list(self.data)
new.data.extend(map(convert_nested_data, data))
else:
new.data = list(self.data)
new.append(data)
return new

def _get_step(self, dur):
return dur

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
long_description=long_description,
long_description_content_type="text/markdown",
entry_points={'gui_scripts' : ['FoxDot = FoxDot.__init__:main']},
data_files=[('', 'LICENSE')],
package_data = {'FoxDot': ['snd/*/*/*.*',
'snd/_loop_/foxdot.wav',
'snd/_loop_/drums130.wav',
Expand All @@ -51,7 +52,6 @@
'lib/Extensions/*/*/*.*',
'lib/.version',
'README.md',
'LICENSE'
],
'FoxDot.lib.Workspace': ['img/*', 'tmp/*'],
'FoxDot.lib.Settings' : ['conf.txt']})
Expand Down

0 comments on commit c0603d2

Please sign in to comment.