November 2017 - tor-commits - lists.torproject.org

[stem/master] Version 1.6 changelog header
by atagar＠torproject.org 06 Nov '17

06 Nov '17

commit 80a5369e8962d690e078c283e38fcf7985930533 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 6 15:00:21 2017 -0800 Version 1.6 changelog header --- docs/change_log.rst | 7 +++++++ stem/__init__.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index e6ff38d3..d85c3003 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -43,6 +43,13 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. +.. _version_1.6: + +Version 1.6 (November 5th, 2018) +-------------------------------- + +Year long accumulation of fixes and improvements in support of the Nyx 2.0 release. + * **Controller** * :func:`~stem.process.launch_tor` raised a ValueError if invoked when outside the main thread diff --git a/stem/__init__.py b/stem/__init__.py index ea092f5a..2741cee7 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -478,7 +478,7 @@ Library for working with the tor process. import stem.util.enum -__version__ = '1.6.0' +__version__ = '1.6.0-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Nov '17

06 Nov '17

commit e4b987c7456782e0bccdb57cf4a8de4ab7e3b3fd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 6 22:20:54 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/it/it.po b/it/it.po index 9a01910f9..a1b36eb8f 100644 --- a/it/it.po +++ b/it/it.po @@ -1383,6 +1383,10 @@ msgid "" "Issues</link> page to see if the problem you are experiencing is already " "listed there." msgstr "" +"Il Browser Tor è in continuo sviluppo, alcuni problemi sono conosciuti ma " +"non ancora risolti. Per favore controlla la pagina <link xref=\"known-" +"issues\"> Problemi conosciuti</link> per vedere se il problema che stai " +"incontrando è già stato inserito della pagina." #: uninstalling.page:6 msgid "How to remove Tor Browser from your system" @@ -1528,6 +1532,9 @@ msgid "" "(see the <link xref=\"uninstalling\">Uninstalling</link> section for more " "information)." msgstr "" +"Rimuovi il browser Tor dal tuo sistema la cancellando la directory che lo " +"contiene ( guarda la sezione <link xref=\"uninstalling\">Disinstalla </link>" +" per maggiori informazioni)" #: updating.page:74 msgid "" @@ -1536,6 +1543,7 @@ msgid "" "a copy of the latest Tor Browser release, then install it as before." msgstr "" "Visitate <link " -"href=\"https://www.torproject.org/projects/torbrowser.html.en> e scaricate " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\"> " +"https://www.torproject.org/projects/torbrowser.html.en </link>e scaricate " "una copia dell'ultima versione del browser Tor, quindi installatela come " "prima."

1 0

[nyx/master] Update site to reflection our 2.0.4 release
by atagar＠torproject.org 06 Nov '17

06 Nov '17

commit e8e14cceefe7a3905ca5704eff71aca1b5e6cf08 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 6 14:10:12 2017 -0800 Update site to reflection our 2.0.4 release --- nyx/__init__.py | 2 +- web/index.html | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index be6a1d6..ce1f8c5 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -89,7 +89,7 @@ except ImportError: sys.exit(1) -__version__ = '2.0.4' +__version__ = '2.0.4-dev' __release_date__ = 'November 5, 2017' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' diff --git a/web/index.html b/web/index.html index 3f2fafd..72b098c 100644 --- a/web/index.html +++ b/web/index.html @@ -48,7 +48,7 @@ <p>Nyx is a command-line monitor for <a href="https://www.torproject.org/">Tor</a>. With this you can get detailed real-time information about your relay such as bandwidth usage, connections, logs, and much more.</p> - <p>Nyx's latest version is <b>1.4.5</b>, released April 28th, 2012. Prior to our upcoming release this application went under the name of '<b>arm</b>'. Sorry for the confusion!</p> + <p>Nyx's latest version is <b>2.0.4</b>, released November 5th, 2017. Prior this application went under the name of '<b>arm</b>'. Sorry for the confusion!</p> <div id="features" class="section"></div> <a href="#features" class="section-title">What does Nyx provide?</a> @@ -332,7 +332,6 @@ sudo python setup.py install</pre><br></li> <br> -  <div class="platform"> <a href="http://packages.debian.org/sid/tor-arm" id="debian"><img src="images/download/debian.png" alt="Debian"></a>

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Nov '17

06 Nov '17

commit 8d10367e9eedbead973610b30eeda525f263114c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 6 21:50:34 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/it/it.po b/it/it.po index 8703972f8..9a01910f9 100644 --- a/it/it.po +++ b/it/it.po @@ -222,6 +222,8 @@ msgid "" "external ref='media/tor-launcher-custom-bridges_en-US.png' " "md5='93365c2aa3fb4d627497e83f28a39b7e'" msgstr "" +"link esterno ref='media/tor-launcher-custom-bridges_en-US.png' " +"md5='93365c2aa3fb4d627497e83f28a39b7e' " #: bridges.page:65 msgid "" @@ -290,6 +292,9 @@ msgid "" " clicking on the green onion near your address bar and selecting “Tor " "Network Settings”." msgstr "" +"Puoi anche configurare i pluggable transports con il browser Tor in " +"esecuzione; basta schiacciare la cipolla verde vicino alla barra degli " +"indirizzi e selezionare \" Impostazioni rete Tor\"" #: circumvention.page:41 msgid "" @@ -309,6 +314,8 @@ msgid "" "external ref='media/circumvention/bridges.png' " "md5='910cdd5e45860b81a1ad4739c589a195'" msgstr "" +"link esterno ref='media/circumvention/bridges.png' " +"md5='910cdd5e45860b81a1ad4739c589a195" #: circumvention.page:51 msgid "" @@ -412,6 +419,12 @@ msgid "" "“32-bit” or “64-bit” software: this depends on the model of the computer you" " are using." msgstr "" +"GetTor risponderà con una mail contenente il linkda dove scaricare il " +"browser Tor, la firma criptografica ( necessaria per verificare il " +"download), l'impronta digitale della chiave utilizzata per per generare la " +"firma digitale e il checksum del pacchetto. Potrete scegliere tra programma " +"a \"32-bit\" o \"64-bit\"; questo dipenderà dal modello di computer che " +"state usando" #: downloading.page:57 msgid "To use GetTor via Twitter:" @@ -519,6 +532,8 @@ msgid "" "external ref='media/first-time/connect.png' " "md5='9d07068f751a3bfd274365a4ba8d90ca'" msgstr "" +"link esterno ref='media/first-time/connect.png' " +"md5='9d07068f751a3bfd274365a4ba8d90ca' " #: first-time.page:23 msgid "" @@ -540,6 +555,9 @@ msgid "" "select this option. Tor Browser will take you through a series of " "configuration options." msgstr "" +"Se sapete che la vostra connessione è censurata, o utilizza un proxy, " +"scegliete questa opzione. Il browser Tor vi guiderà attraverso una seri di " +"opzioni di configurazione." #: first-time.page:44 msgid "" @@ -657,6 +675,8 @@ msgid "" "Tor Browser can also be started from the command line by running the " "following command from inside the Tor Browser directory:" msgstr "" +"il browser Tor puo essere lanciato anche da riga di comando eseguendo il " +"seguente comando all'interno della cartella del Browser Tor:" #: known-issues.page:66 #, no-wrap @@ -1012,6 +1032,7 @@ msgstr "" #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" msgstr "" +"Impara come proteggere i tuoi dati utilizzando il browser Tor e l'HTTPS" #: secure-connections.page:12 msgid "Secure Connections" @@ -1312,6 +1333,8 @@ msgid "" "Your computer’s system clock must be set correctly, or Tor will not be able " "to connect." msgstr "" +"L'orologio del vostro computer deve essere configurato correttamente o Tor " +"non sarà in grado di connettersi" #: troubleshooting.page:35 msgid "" @@ -1496,6 +1519,8 @@ msgid "" "When you are prompted to update Tor Browser, finish the browsing session and" " close the program." msgstr "" +"Quando vi verrà indicato di aggiornare il browser Tor, finite la sessione di" +" navigazione e chiudete il programma" #: updating.page:67 msgid "" @@ -1510,3 +1535,7 @@ msgid "" " https://www.torproject.org/projects/torbrowser.html.en</link> and download " "a copy of the latest Tor Browser release, then install it as before." msgstr "" +"Visitate <link " +"href=\"https://www.torproject.org/projects/torbrowser.html.en> e scaricate " +"una copia dell'ultima versione del browser Tor, quindi installatela come " +"prima."

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Nov '17

06 Nov '17

commit f702045909f5ed4b9f0ea8dd2380c551dce1509f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 6 21:20:33 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/it/it.po b/it/it.po index 64fa40edc..8703972f8 100644 --- a/it/it.po +++ b/it/it.po @@ -260,7 +260,7 @@ msgstr "" #: circumvention.page:22 msgid "Using pluggable transports" -msgstr "" +msgstr "Utilizzare i pluggable transports" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -280,6 +280,9 @@ msgid "" "To use pluggable transports, click \"Configure\" in the Tor Launcher window " "that appears when you first run Tor Browser." msgstr "" +"Per utilizzare i pluggable transports schiacciare il pulsante \"Configura\" " +"nella finestra di avvio che apparirà la prima volta che utilizzerete il " +"browser Tor" #: circumvention.page:33 msgid "" @@ -293,7 +296,7 @@ msgid "" "Select “yes” when asked if your Internet Service Provider blocks connections" " to the Tor network." msgstr "" -"Seleziona \"Si\", quando richiesto, se il tuo Internet Service Provider " +"Seleziona \"Si\", quando richiesto, se il tuo fornitore di servizi Internet " "blocca la connessione alla rete Tor" #. This is a reference to an external file such as an image or video. When @@ -367,6 +370,10 @@ msgid "" "for example, it could be blocked on your network. If this happens, you can " "use one of the alternative download methods listed below." msgstr "" +"Purtroppo, ci potrebbero essere delle volte per cui non potresti accedere al" +" sito del Tor Project, per esempio potrebbe essere bloccato sulla tua rete. " +"Se questo dovesse accadere puoi utilizzare uno dei metodi alternativi qui " +"sotto riportati per scaricarlo." #: downloading.page:27 msgid "GetTor" @@ -416,6 +423,9 @@ msgid "" "Message to @get_tor with the words \"osx en\" in it (you don't need to " "follow the account)." msgstr "" +"Per ottenere i link per scaricare il browser TOR in inglese per OS X, invia " +"un messaggio a @get_tor contenente il testo \"osx en\" ( non è necessario " +"seguire l'account)" #: downloading.page:70 msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" @@ -452,7 +462,7 @@ msgstr "Installa Satori dall'App Store di Chrome" #: downloading.page:100 msgid "Select Satori from your browser’s Apps menu." -msgstr "" +msgstr "Seleziona Satori dal menu Applicazioni del tuo browser" #: downloading.page:105 msgid "" @@ -597,6 +607,8 @@ msgid "" "The following firewall software have been known to interfere with Tor and " "may need to be temporarily disabled:" msgstr "" +"I seguenti programmi firewall possono interferire con Tor, per questo motivo" +" potrebbe essere necessario disabilitarli temporaneamente" #: known-issues.page:23 msgid "Webroot SecureAnywhere" @@ -619,10 +631,12 @@ msgid "" "Videos that require Adobe Flash are unavailable. Flash is disabled for " "security reasons." msgstr "" +"Filmati che richiedono Adobe Flash non sono disponibili, Flash è " +"disabilitato per motivi di sicurezza" #: known-issues.page:43 msgid "Tor can not use a bridge if a proxy is set." -msgstr "" +msgstr "tor non può cambiare un ponte se un proxy è configurato." #: known-issues.page:48 msgid "" @@ -1194,6 +1208,8 @@ msgid "" "At this level, all browser features are enabled. This is the most usable " "option." msgstr "" +"A questo livello tutte le caratteristiche del browser sono attivate. Questa " +"è l'opzione piu' comune" #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" @@ -1244,7 +1260,7 @@ msgstr "Scramblesuit" #: transports.page:61 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." -msgstr "" +msgstr "ScrambleSuit è simile a obfs4 ma utilizza un diverso tipo di ponte. " #: transports.page:69 msgid "FTE"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Nov '17

06 Nov '17

commit e1338c2d420e2f212bc5b655e79ac24e4d9c0da7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 6 20:50:34 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/it/it.po b/it/it.po index d4a17ceff..64fa40edc 100644 --- a/it/it.po +++ b/it/it.po @@ -14,12 +14,13 @@ # Daniele <daniele356(a)protonmail.com>, 2017 # Giuseppe Pignataro (Fasbyte01) <rogepix(a)gmail.com>, 2017 # s r <stefano.rufini(a)gmail.com>, 2017 +# Paveway noname <paveway80(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: s r <stefano.rufini(a)gmail.com>, 2017\n" +"Last-Translator: Paveway noname <paveway80(a)gmail.com>, 2017\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -292,6 +293,8 @@ msgid "" "Select “yes” when asked if your Internet Service Provider blocks connections" " to the Tor network." msgstr "" +"Seleziona \"Si\", quando richiesto, se il tuo Internet Service Provider " +"blocca la connessione alla rete Tor" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -389,6 +392,9 @@ msgid "" "simply write “windows”, “osx”, or “linux”, (without quotation marks) " "depending on your operating system." msgstr "" +"Invia una mail a gettor(a)torproject.org, nel corpo del messaggio scrivi " +"semplicemente \"windows\", \" osx\" o \"Linux\" ( senza virgolette) in " +"funzione al sistema operativo che stai utilizzando" #: downloading.page:46 msgid "" @@ -402,7 +408,7 @@ msgstr "" #: downloading.page:57 msgid "To use GetTor via Twitter:" -msgstr "" +msgstr "Per usare GetTor via Twitter" #: downloading.page:62 msgid "" @@ -413,7 +419,7 @@ msgstr "" #: downloading.page:70 msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" -msgstr "" +msgstr "Per usare GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM)\\: " #: downloading.page:75 msgid "" @@ -432,10 +438,13 @@ msgid "" "Satori is an add-on for the Chrome or Chromium browsers that allows you to " "download several security and privacy programs from different sources." msgstr "" +"Satori è un add-on per i browser Chrome o Chromium che ti permette di " +"scaricare differenti programmi di sicurezza e per la privacy da differenti " +"fonti" #: downloading.page:90 msgid "To download Tor Browser using Satori:" -msgstr "" +msgstr "Per scaricare il Browser Tor utilizzando Satori:" #: downloading.page:95 msgid "Install Satori from the Chrome App Store."

1 0

[nyx/master] Switch installation to setuptools
by atagar＠torproject.org 06 Nov '17

06 Nov '17

commit b89f6ca3fa90631e9c0aa5f5e3e6e4dcf492fcc6 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 6 12:03:25 2017 -0800 Switch installation to setuptools Got additional testers on #tor-dev and turns out our custom installer causes it to fail for just about everybody. Dropping the ability to specify a man or samplerc path to get us back on the road best traveled. Also swapping from distutil to setuptools so we have entry_points (which we need for a bin script). --- nyx/__init__.py | 2 +- setup.py | 113 +++------------------------------------------------ test/installation.py | 2 +- 3 files changed, 7 insertions(+), 110 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 48dd767..d500970 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -89,7 +89,7 @@ except ImportError: sys.exit(1) -__version__ = '2.0.2' +__version__ = '2.0.3' __release_date__ = 'November 5, 2017' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' diff --git a/setup.py b/setup.py index 37923cc..5659053 100644 --- a/setup.py +++ b/setup.py @@ -2,16 +2,10 @@ # Copyright 2010-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information -import gzip +import setuptools import os import re -import stat import sys -import sysconfig - -from distutils import log -from distutils.core import setup -from distutils.command.install import install if '--dryrun' in sys.argv: DRY_RUN = True @@ -66,113 +60,15 @@ with open('nyx/__init__.py') as init_file: if m: ATTR[m.group(1)] = m.group(2) - -class NyxInstaller(install): - """ - Nyx installer. This adds the following additional options... - - --man-page [path] - --sample-path [path] - - If the man page path ends in '.gz' it will be compressed. Empty paths such - as... - - % python setup.py install --man-page '' - - ... will cause that resource to be omitted. - """ - - # We don't actually use single-version-externally-managed. Unfortunately pip - # has a bug where it expects any cmdclass to be setuptools, otherwise it - # fails with... - # - # % sudo pip install nyx - # ... - # Installing collected packages: nyx - # Running setup.py install for nyx ... error - # Complete output from command /usr/bin/python -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-EOQT9b/nyx/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" install --record /tmp/pip-PHiCsl-record/install-record.txt --single-version-externally-managed --compile: - # usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] - # or: -c --help [cmd1 cmd2 ...] - # or: -c --help-commands - # or: -c cmd --help - # - # error: option --single-version-externally-managed not recognized - # - # We have a few options to sidestep this... - # - # * Have users install with 'sudo pip install --egg nyx' instead. - # * Extend setuptools.command.install, which has the argument. - # * Hack in a no-op argument to sidestep as we do here. - - user_options = install.user_options + [ - ('man-page=', None, 'man page location'), - ('sample-path=', None, 'example nyxrc location'), - ('single-version-externally-managed', None, ''), # needed to sidestep pip bug - ] - - def initialize_options(self): - install.initialize_options(self) - self.man_page = None - self.sample_path = None - self.single_version_externally_managed = None - - def run(self): - install.run(self) - - self.install_bin_script('run_nyx', os.path.join(self.install_scripts, 'nyx')) - self.install_file('man page', 'nyx.1', self.man_page) - self.install_file('nyxrc sample', os.path.join('web', 'nyxrc.sample'), self.sample_path) - - def install_bin_script(self, source, dest): - # Install our bin script. We do this ourselves rather than with the setup() - # method's scripts argument because we want to call the script 'nyx' rather - # than 'run_nyx'. - # - # If using setuptools this would be better replaced with its entry_points. - - self.mkpath(os.path.dirname(dest)) - - with open(source, 'rb') as source_file: - with open(dest, 'wb') as dest_file: - orig_shebang = source_file.readline() - - python_cmd = 'python%s%s' % (sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('EXE')) - new_shebang = '#!%s\n' % os.path.join(sysconfig.get_config_var('BINDIR'), python_cmd) - - log.info("adjusting bin script's shebang line '%s' -> '%s'" % (orig_shebang.strip(), new_shebang.strip())) - dest_file.write(str.encode(new_shebang)) - dest_file.write(source_file.read()) - - mode = ((os.stat(dest)[stat.ST_MODE]) | 0o555) & 0o7777 - os.chmod(dest, mode) - log.info("installed bin script to '%s'" % dest) - - def install_file(self, resource, source, dest): - if not dest: - log.info('skipping installation of the %s' % resource) - return - elif not os.path.exists(source): - raise OSError(None, "%s doesn't exist at '%s'" % (resource, source)) - - self.mkpath(os.path.dirname(dest)) - open_func = gzip.open if dest.endswith('.gz') else open - - with open(source, 'rb') as source_file: - with open_func(dest, 'wb') as dest_file: - dest_file.write(source_file.read()) - log.info("installed %s to '%s'" % (resource, dest)) - - # installation requires us to be in our setup.py's directory -setup_dir = os.path.dirname(os.path.join(os.getcwd(), __file__)) -os.chdir(setup_dir) +os.chdir(os.path.dirname(os.path.abspath(__file__))) with open('MANIFEST.in', 'w') as manifest_file: manifest_file.write(MANIFEST) try: - setup( + setuptools.setup( name = 'nyx-dry-run' if DRY_RUN else 'nyx', version = ATTR['version'], description = DRY_RUN_SUMMARY if DRY_RUN else SUMMARY, @@ -185,7 +81,8 @@ try: keywords = 'tor onion controller', install_requires = ['stem>=1.6.0'], package_data = {'nyx': ['settings/*']}, - cmdclass = {'install': NyxInstaller}, + data_files = [('man/man1', ['nyx.1'])], + entry_points = {'console_scripts': ['nyx = nyx.__init__:main']}, classifiers = [ 'Development Status :: 5 - Production/Stable', 'Environment :: Console :: Curses', diff --git a/test/installation.py b/test/installation.py index 3095e16..d37d852 100644 --- a/test/installation.py +++ b/test/installation.py @@ -20,7 +20,7 @@ class TestInstallation(unittest.TestCase): try: os.chdir(base_directory) - stem.util.system.call(sys.executable + ' setup.py install --prefix /tmp/nyx_test --man-page /tmp/nyx_test/nyx.1.gz --sample-path /tmp/nyx_test/nyxrc.sample') + stem.util.system.call(sys.executable + ' setup.py install --prefix /tmp/nyx_test') stem.util.system.call(sys.executable + ' setup.py clean --all') # tidy up the build directory site_packages_paths = glob.glob('/tmp/nyx_test/lib*/*/site-packages')

1 0

[nyx/master] Install fails with "error: could not create '/usr/local/man'"
by atagar＠torproject.org 06 Nov '17

06 Nov '17

commit 258ddfc4ef1e73ff1fdd7c44edf88587f185c0b2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 6 12:23:54 2017 -0800 Install fails with "error: could not create '/usr/local/man'" God damnit. How error prone can they make this? Installing with 'pip install -U nyx' works but lacking the '-U' flag causes us to fail to add the man page. Fine. Screw it. We weren't instructing pip to create that but I give up - package managers can handle the man installation. --- nyx/__init__.py | 2 +- setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index d500970..be6a1d6 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -89,7 +89,7 @@ except ImportError: sys.exit(1) -__version__ = '2.0.3' +__version__ = '2.0.4' __release_date__ = 'November 5, 2017' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' diff --git a/setup.py b/setup.py index 5659053..41155e4 100644 --- a/setup.py +++ b/setup.py @@ -81,7 +81,6 @@ try: keywords = 'tor onion controller', install_requires = ['stem>=1.6.0'], package_data = {'nyx': ['settings/*']}, - data_files = [('man/man1', ['nyx.1'])], entry_points = {'console_scripts': ['nyx = nyx.__init__:main']}, classifiers = [ 'Development Status :: 5 - Production/Stable',

1 0

[tor-browser-build/master] Bug 24156: remove dash in build_log when var/osname is not defined
by gk＠torproject.org 06 Nov '17

06 Nov '17

commit 072d3ab7f61733a071ca13a66bdb1fe1922e1e41 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 6 18:44:41 2017 +0100 Bug 24156: remove dash in build_log when var/osname is not defined In projects/debootstrap-image, the option var/osname is not defined, so the build_log filename was logs/debootstrap-image-.log. --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 6e800f2..83c2086 100644 --- a/rbm.conf +++ b/rbm.conf @@ -3,7 +3,7 @@ debug: '[% GET ! ENV.RBM_NO_DEBUG %]' compress_tar: gz output_dir: "out/[% project %]" tmp_dir: '[% c("basedir") %]/tmp' -build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %]-[% c("var/osname") %].log' +build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %][% IF c("var/osname") %]-[% c("var/osname") %][% END %].log' pkg_type: build

1 0

[nyx/master] Cannot install when stem is unavailable
by atagar＠torproject.org 06 Nov '17

06 Nov '17

commit 55b1547eb9977dee76d749837b34f298fec1e36a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 5 15:29:16 2017 -0800 Cannot install when stem is unavailable Damn. Installing with pip fails with an ImportError because our setup.py imports nyx/__init__.py which in turn imports stem. As such just reading our file instead. --- nyx/__init__.py | 2 +- setup.py | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 4133c1d..65102b0 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -89,7 +89,7 @@ except ImportError: sys.exit(1) -__version__ = '2.0.0' +__version__ = '2.0.1' __release_date__ = 'November 5, 2017' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' diff --git a/setup.py b/setup.py index db63e61..511e29a 100644 --- a/setup.py +++ b/setup.py @@ -4,17 +4,15 @@ import gzip import os +import re import stat import sys import sysconfig -import nyx - from distutils import log from distutils.core import setup from distutils.command.install import install - if '--dryrun' in sys.argv: DRY_RUN = True sys.argv.remove('--dryrun') @@ -54,6 +52,19 @@ global-exclude *.swo global-exclude *~ """.strip() +# We cannot import our own modules since if they import stem it'll break +# installation. As such, just reading our file for the parameters we need. + +ATTR = {} +ATTR_LINE = re.compile("^__(\S+)__ = '(.+)'") + +with open('nyx/__init__.py') as init_file: + for line in init_file: + m = ATTR_LINE.match(line) + + if m: + ATTR[m.group(1)] = m.group(2) + class NyxInstaller(install): """ @@ -138,13 +149,13 @@ with open('MANIFEST.in', 'w') as manifest_file: try: setup( name = 'nyx-dry-run' if DRY_RUN else 'nyx', - version = nyx.__version__, + version = ATTR['version'], description = DRY_RUN_SUMMARY if DRY_RUN else SUMMARY, long_description = DESCRIPTION, - license = nyx.__license__, - author = nyx.__author__, - author_email = nyx.__contact__, - url = nyx.__url__, + license = ATTR['license'], + author = ATTR['author'], + author_email = ATTR['contact'], + url = ATTR['url'], packages = ['nyx', 'nyx.panel'], keywords = 'tor onion controller', install_requires = ['stem>=1.6.0'],

1 0