Skip to content

Commit

Permalink
0.1.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
s-m-e committed Dec 9, 2019
2 parents 55a7f47 + e2ea808 commit 6ecf101
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 16 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changes

## 0.1.1 (2019-12-09)

* FIX: `wenv` installed its environment into `shared` folder instead of `share`.
* FIX: Broken links in README.md

## 0.1.0 (2019-12-08)

`wenv` broken out of [`zugbruecke`](https://github.com/pleiszenburg/zugbruecke) and turned into an independent package. The following changes were made since `zugbruecke` 0.0.14.
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[![build_master](https://img.shields.io/travis/pleiszenburg/wenv/master.svg?style=flat-square "Build Status: master / release")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE)
[![docs_master](https://readthedocs.org/projects/wenv/badge/?version=latest&style=flat-square "Documentation Status: master / release")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE)
[![build_develop](https://img.shields.io/travis/pleiszenburg/wenv/develop.svg?style=flat-square "Build Status: development branch")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE)
[![docs_develop](https://readthedocs.org/projects/wenv/badge/?version=develop&style=flat-square "Documentation Status: development branch")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE)
[![build_master](https://img.shields.io/travis/pleiszenburg/wenv/master.svg?style=flat-square "Build Status: master / release")](https://travis-ci.org/pleiszenburg/wenv)
[![docs_master](https://readthedocs.org/projects/wenv/badge/?version=latest&style=flat-square "Documentation Status: master / release")](https://wenv.readthedocs.io/en/latest/)
[![build_develop](https://img.shields.io/travis/pleiszenburg/wenv/develop.svg?style=flat-square "Build Status: development branch")](https://travis-ci.org/pleiszenburg/wenv)
[![docs_develop](https://readthedocs.org/projects/wenv/badge/?version=develop&style=flat-square "Documentation Status: development branch")](https://wenv.readthedocs.io/en/develop/)
[![license](https://img.shields.io/pypi/l/wenv.svg?style=flat-square "Internet Systems Consortium License")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE)
[![status](https://img.shields.io/pypi/status/wenv.svg?style=flat-square "Project Development Status")](https://github.com/pleiszenburg/wenv/milestone/3)
[![status](https://img.shields.io/pypi/status/wenv.svg?style=flat-square "Project Development Status")](https://github.com/pleiszenburg/wenv/issues)
[![pypi_version](https://img.shields.io/pypi/v/wenv.svg?style=flat-square "Project Development Status")](https://pypi.python.org/pypi/wenv)
[![pypi_versions](https://img.shields.io/pypi/pyversions/wenv.svg?style=flat-square "Available on PyPi - the Python Package Index")](https://pypi.python.org/pypi/wenv)

Expand All @@ -30,8 +30,8 @@ If you are limited to an older version of Wine such as 2.x or 3.x, see `wenv`'s

| branch | status | installation | documentation |
| --- | --- | --- | --- |
| master (release) | [![build_master](https://img.shields.io/travis/pleiszenburg/wenv/master.svg?style=flat-square "Build Status: master / release")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE) | `pip install wenv` | [![docs_master](https://readthedocs.org/projects/wenv/badge/?version=latest&style=flat-square "Documentation Status: master / release")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE) |
| develop | [![build_develop](https://img.shields.io/travis/pleiszenburg/wenv/develop.svg?style=flat-square "Build Status: development branch")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE) | `pip install git+https://github.com/pleiszenburg/wenv.git@develop` | [![docs_develop](https://readthedocs.org/projects/wenv/badge/?version=develop&style=flat-square "Documentation Status: development branch")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE) |
| master (release) | [![build_master](https://img.shields.io/travis/pleiszenburg/wenv/master.svg?style=flat-square "Build Status: master / release")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE) | `pip install wenv` | [![docs_master](https://readthedocs.org/projects/wenv/badge/?version=latest&style=flat-square "Documentation Status: master / release")](https://wenv.readthedocs.io/en/latest/) |
| develop | [![build_develop](https://img.shields.io/travis/pleiszenburg/wenv/develop.svg?style=flat-square "Build Status: development branch")](https://wenv.readthedocs.io/en/develop/) | `pip install git+https://github.com/pleiszenburg/wenv.git@develop` | [![docs_develop](https://readthedocs.org/projects/wenv/badge/?version=develop&style=flat-square "Documentation Status: development branch")](https://github.com/pleiszenburg/wenv/blob/master/LICENSE) |

After installing the package with `pip`, you must initialize the "Wine Python environment" by running ``wenv init``.

Expand Down Expand Up @@ -62,8 +62,8 @@ Feel free to post questions in the [GitHub issue tracker](https://github.com/ple

## Bugs & issues

- Report bugs in wenv here: [GitHub issue tracker](https://github.com/pleiszenburg/wenv/issues)
- Report bugs in Wine here: [WineHQ Bug Tracking System](https://bugs.winehq.org/)
- Report bugs in *wenv* here: [GitHub issue tracker](https://github.com/pleiszenburg/wenv/issues)
- Report bugs in *Wine* here: [WineHQ Bug Tracking System](https://bugs.winehq.org/)

Make sure you have read the chapter on [bugs](http://wenv.readthedocs.io/en/stable/bugs.html) in `wenv`'s documentation.

Expand Down
2 changes: 1 addition & 1 deletion docs/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ This parameter can be used to specify a custom location for the *Wine Python env
``wineprefix`` (str)
^^^^^^^^^^^^^^^^^^^^

This parameter can be used to point to a custom ``WINEPREFIX`` outside of the ``shared`` folder of the current *Unix* *Python*'s prefix. By default, it is set to ``{sys.prefix}/shared/wenv/{arch}``
This parameter can be used to point to a custom ``WINEPREFIX`` outside of the ``shared`` folder of the current *Unix* *Python*'s prefix. By default, it is set to ``{sys.prefix}/share/wenv/{arch}``

``winedebug`` (str)
^^^^^^^^^^^^^^^^^^^
Expand Down
4 changes: 2 additions & 2 deletions docs/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ Motivation

*wenv* was derived from the Python package `zugbruecke`_. *zugbruecke* allows to call routines in *Windows* DLLs from *Python* code running on Unices / *Unix*-like systems such as *Linux*, *MacOS* or *BSD*. *wenv*'s code started out as infrastructure for *zugbruecke*. Eventually, it became too complex on its own and - at the same time - began to enable new and interesting use cases beyond the scope of *zugbruecke*.

Technically, the basic problem is how to install (and run) just any version or distribution of *Python* on *Wine*. The installers of most *Python* distributions including *Anaconda* and even *CPython* itself tend to be broken on most versions of *Wine* ("garbage" in *Wine* jargon). For a while, *ActiveState*'s *ActivePython* was the only "easy" way of directly installing *Python* on *Wine*, but even this path was (and still is) extremely unreliable. The commonly recommended workaround is to install *Python* directly on Windows and copy the resulting installation directory tree over to *Unix*/*Wine*. First, this is not an option for everybody as it requires a *Windows* installation. Second, it is also notoriously unreliable.
Technically, the basic problem is how to install (and run) just any version or distribution of *Python* on *Wine*. The installers of most *Python* distributions including *Anaconda* and even *CPython* itself tend to be broken on most versions of *Wine* ("garbage" in *Wine* jargon). For a while, *ActiveState*'s *ActivePython* was the only "easy" way of directly installing *Python* on *Wine*, but even this path was (and still is) extremely unreliable. The commonly recommended workaround is to install *Python* directly on *Windows* and copy the resulting installation directory tree over to *Unix*/*Wine*. First, this is not an option for everybody as it requires a *Windows* installation. Second, it is also notoriously unreliable.

While researching options for developing *zugbruecke*, *CPython*'s `embeddable package`_ for Windows showed up on the radar. It is a simple ZIP-file without any installer. By merely unpacking it, one can run *Python* without an issue. With some manual tweaking and tuning of both the unpacked folder and *Wine*, it becomes possible to make ``pip`` work and install just about anything on top. *wenv* essentially takes care of the entire process automatically.
While researching options for developing *zugbruecke*, *CPython*'s `embeddable package`_ for *Windows* showed up on the radar. It is a simple ZIP-file without any installer. By merely unpacking it, one can run *Python* without an issue. With some manual tweaking and tuning of both the unpacked folder and *Wine*, it becomes possible to make ``pip`` work and install just about anything on top. *wenv* essentially takes care of the entire process automatically.

.. _zugbruecke: https://github.com/pleiszenburg/zugbruecke
.. _embeddable package: https://docs.python.org/3/using/windows.html#windows-embeddable
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@


# Bump version HERE!
_version_ = '0.1.0'
_version_ = '0.1.1'


# List all versions of Python which are supported
Expand Down Expand Up @@ -82,11 +82,9 @@
install_requires = [],
extras_require = {
'dev': [
'hypothesis',
'pytest',
'coverage',
'pytest-cov',
'Jinja2',
'python-language-server',
'setuptools',
'Sphinx',
Expand Down
2 changes: 1 addition & 1 deletion src/wenv/_core/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def __getitem__(self, key):
elif key == 'winedebug':
return '-all' # Wine debug output off
elif key == 'wineprefix':
return os.path.join(sys.prefix, 'shared', 'wenv', self['arch'])
return os.path.join(sys.prefix, 'share', 'wenv', self['arch'])
elif key == 'pythonprefix':
return os.path.join(self['wineprefix'], 'drive_c', 'python-%s' % self['pythonversion'])
elif key == '_issues_50_workaround':
Expand Down

0 comments on commit 6ecf101

Please sign in to comment.