Merge branch 'matko' into 'master'

Make package pip installable See merge request computational-psychology/stimuli!2
computational-psychology · Apr 26, 2021 · 8eada0a · 8eada0a
2 parents 6a63987 + 1d2df0a
commit 8eada0a
Show file tree

Hide file tree

Showing 63 changed files with 678 additions and 625 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,5 @@ docs/_build/
 
 # PyBuilder
 target/
+
+.vscode/
diff --git a/README.md b/README.md
@@ -26,11 +26,12 @@ First clone the repository via
 git clone https://github.com/computational-psychology/stimuli.git
 ``` 
 
-Then run `python setup.py install` at the root of the repository.
-
+Then run `pip install .` at the root of the repository.
 The repository may then be removed again.
 
-To update to a newer version, run `python setup.py install --force`.
+To install in developer/editable mode: `pip install -e .` at the root directory.
+This makes changes to files immediately usable,
+rather than having to reinstall the package after every change.
 
 ## Importing
 To use in your own code, import the modules. See READMEs in src/ for example usages.

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
         author_email='guillermo.aguilar@mail.tu-berlin.de',
         license='GPL2',
         url='https://github.com/computational-psychology/stimuli',
-        package_dir={'stimuli': 'src'},
+        package_dir={'stimuli': 'stimuli'},
         packages=(
             'stimuli',
             'stimuli.lightness',

diff --git a/src/illusions/__init__.py b/src/illusions/__init__.py