diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-09 12:04:31 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-09 12:04:31 -0300 |
| commit | 4983b0793275ace0dbc49428291324a1eb4e5aa3 (patch) | |
| tree | a2d471486a5dddcaf0800913531f7a68f8f0b483 | |
| parent | 65fd449bdaeca67ab3b361dcee5f72729f207bb7 (diff) | |
| parent | 0635f067d5c5b4c186abe7de4d8e692ad09a1416 (diff) | |
Merge remote-tracking branch 'ivan/feature/3421_update-docs' into develop
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | data/bitmask.pro (renamed from data/leap_client.pro) | 0 | ||||
| -rw-r--r-- | docs/dev/internationalization.rst | 2 | ||||
| -rw-r--r-- | docs/dev/tests.rst | 4 | ||||
| -rw-r--r-- | src/leap/_version.py | 9 |
5 files changed, 8 insertions, 11 deletions
@@ -17,7 +17,7 @@ COMPILED_DIR = src/leap/gui TRANSLAT_DIR = data/translations #Project file, used for translations -PROJFILE = data/leap_client.pro +PROJFILE = data/bitmask.pro #UI files to compile UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui statuspanel.ui @@ -58,7 +58,7 @@ $(COMPILED_DIR)/%_rc.py : $(RESOURCE_DIR)/%.qrc $(PYRCC) $< -o $@ manpages: - rst2man docs/man/leap.1.rst docs/man/leap.1 + rst2man docs/man/bitmask.1.rst docs/man/bitmask.1 apidocs: @sphinx-apidoc -o docs/api src/leap diff --git a/data/leap_client.pro b/data/bitmask.pro index ff26ad1a..ff26ad1a 100644 --- a/data/leap_client.pro +++ b/data/bitmask.pro diff --git a/docs/dev/internationalization.rst b/docs/dev/internationalization.rst index 21d58924..f9f522b9 100644 --- a/docs/dev/internationalization.rst +++ b/docs/dev/internationalization.rst @@ -65,7 +65,7 @@ If you do not already have it, install the ``transifex-client`` from the cheese You can learn more about the transifex-client `here <http://help.transifex.com/features/client/index.html>`_. -**1.** Add any new source files to the project file, ``data/leap_client.pro``. *We should automate this with some templating, it's tedious.* +**1.** Add any new source files to the project file, ``data/bitmask.pro``. *We should automate this with some templating, it's tedious.* **2.** Update the source .ts file ``data/ts/en_US.ts``.:: diff --git a/docs/dev/tests.rst b/docs/dev/tests.rst index 7f5fbaaf..d55c206a 100644 --- a/docs/dev/tests.rst +++ b/docs/dev/tests.rst @@ -39,8 +39,8 @@ Hint: colorized output Install ``rednose`` locally, export the ``NOSE_REDNOSE`` variable, and give your eyes a rest :):: - (leap_client)% pip install rednose - (leap_client)% export NOSE_REDNOSE=1 + (bitmask)% pip install rednose + (bitmask)% export NOSE_REDNOSE=1 Testing all the supported python versions ----------------------------------------- diff --git a/src/leap/_version.py b/src/leap/_version.py index 6f7e3d05..05542975 100644 --- a/src/leap/_version.py +++ b/src/leap/_version.py @@ -16,6 +16,8 @@ git_full = "$Format:%H$" import subprocess import sys +import re +import os.path def run_command(args, cwd=None, verbose=False): @@ -38,11 +40,6 @@ def run_command(args, cwd=None, verbose=False): return stdout -import sys -import re -import os.path - - def get_expanded_variables(versionfile_source): # the code embedded in _version.py can just fetch the value of these # variables. When used from setup.py, we don't want to import @@ -187,7 +184,7 @@ def versions_from_parentdir(parentdir_prefix, versionfile_source, return {"version": dirname[len(parentdir_prefix):], "full": ""} tag_prefix = "" -parentdir_prefix = "leap_client-" +parentdir_prefix = "bitmask-" versionfile_source = "src/leap/_version.py" |