Bug fixed and updated documentation.

CHANGES.rst

@@ -1,6 +1,12 @@
 Changes
 =======
 
+0.0.7 (2018-03-05)
+------------------
+
+* FIX: Wine Python environment sometimes did, unintentionally, fall back to Python 2 and crash, see issue #20.
+* Confirmed: Support for Mac OS X, see issue #16.
+
 0.0.6 (2017-12-06)
 ------------------
 

CONTRIBUTING.rst

@@ -71,10 +71,11 @@ Looking for work? Check *zugbruecke*'s `open issues`_ :)
 
 .. _open issues: https://github.com/pleiszenburg/zugbruecke/issues
 
-First time setup
-----------------
+First time setup for developers
+-------------------------------
 
 - Make sure you have *Wine* 2.x and *CPython* 3.x installed.
+- Make sure you have the *mingw* cross compiler installed for compiling the *Windows* test DLL.
 - Download and install the `latest version of git`_.
 - Configure git with your `username`_ and `email`_:
 
@@ -113,6 +114,18 @@ First time setup
 
 	make install_link
 
+- Compile the *Windows* test DLL:
+
+.. code:: bash
+
+	make dll
+
+- Run the test suite and confirm that the development environment is fully functional:
+
+.. code:: bash
+
+	make test
+
 .. _GitHub account: https://github.com/join
 .. _latest version of git: https://git-scm.com/downloads
 .. _username: https://help.github.com/articles/setting-your-username-in-git/

README.rst

@@ -73,7 +73,7 @@ Prerequisites
 
 +--------------------+-------------------------------------------------------------------------------------------------------------+
 | for usage          + - `CPython`_ 3.x (tested with 3.{4,5,6}) - no additional Python packages required                           +
-|                    + - `Wine`_ 2.x (tested with 2.{5 to 19} regular & `staging`_) - expected to be in the user's `PATH`_         +
+|                    + - `Wine`_ 2.x/3.x (tested with 2.{5 to 21} regular & `staging`_) - expected to be in the user's `PATH`_     +
 +--------------------+-------------------------------------------------------------------------------------------------------------+
 | for tests          + - `pytest`_                                                                                                 +
 |                    + - `mingw cross-compiler`_ - for building DLLs against which examples and tests can be run                   +

scripts/wine-pip

@@ -23,19 +23,19 @@
 # </LICENSE_BLOCK>
 
 # Get parameters from zugbruecke configuration
-arch=$(python -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("arch")')
-version=$(python -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("version")')
-zugbruecke_dir=$(python -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("dir")')
+arch=$(python3 -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("arch")')
+version=$(python3 -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("version")')
+zugbruecke_dir=$(python3 -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("dir")')
 
 # Process parameters
 dir_py=$zugbruecke_dir/$arch-python$version
 dir_wine=$zugbruecke_dir/$arch-wine
 
 # Make sure Python for Wine is installed
-python -c "from zugbruecke.core.wineenv import setup_wine_python; setup_wine_python(\"$arch\", \"$version\", \"$zugbruecke_dir\")"
+python3 -c "from zugbruecke.core.wineenv import setup_wine_python; setup_wine_python(\"$arch\", \"$version\", \"$zugbruecke_dir\")"
 
 # Make sure Pip for Wine is installed
-python -c "from zugbruecke.core.wineenv import setup_wine_pip; setup_wine_pip(\"$arch\", \"$version\", \"$zugbruecke_dir\")"
+python3 -c "from zugbruecke.core.wineenv import setup_wine_pip; setup_wine_pip(\"$arch\", \"$version\", \"$zugbruecke_dir\")"
 
 # Set environment variables
 export WINEARCH="$arch"

scripts/wine-pytest

@@ -23,9 +23,9 @@
 # </LICENSE_BLOCK>
 
 # Get parameters from zugbruecke configuration
-arch=$(python -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("arch")')
-version=$(python -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("version")')
-zugbruecke_dir=$(python -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("dir")')
+arch=$(python3 -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("arch")')
+version=$(python3 -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("version")')
+zugbruecke_dir=$(python3 -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("dir")')
 
 # Process parameters
 dir_py=$zugbruecke_dir/$arch-python$version

scripts/wine-python

@@ -23,16 +23,16 @@
 # </LICENSE_BLOCK>
 
 # Get parameters from zugbruecke configuration
-arch=$(python -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("arch")')
-version=$(python -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("version")')
-zugbruecke_dir=$(python -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("dir")')
+arch=$(python3 -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("arch")')
+version=$(python3 -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("version")')
+zugbruecke_dir=$(python3 -c 'from zugbruecke.core.config import echo_parameter; echo_parameter("dir")')
 
 # Process parameters
 dir_py=$zugbruecke_dir/$arch-python$version
 dir_wine=$zugbruecke_dir/$arch-wine
 
 # Make sure Python for Wine is installed
-python -c "from zugbruecke.core.wineenv import setup_wine_python; setup_wine_python(\"$arch\", \"$version\", \"$zugbruecke_dir\")"
+python3 -c "from zugbruecke.core.wineenv import setup_wine_python; setup_wine_python(\"$arch\", \"$version\", \"$zugbruecke_dir\")"
 
 # Set environment variables
 export WINEARCH="$arch"

setup.py

@@ -46,7 +46,7 @@
 
 
 # Bump version HERE!
-_version_ = '0.0.6'
+_version_ = '0.0.7'
 
 
 # List all versions of Python which are supported