April 2020 - tor-commits - lists.torproject.org

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 02 Apr '20

02 Apr '20

commit eca57a148c5fa3a6d5cf7498e1539da4fdce0c77 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 2 04:53:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index c90887fcad..c6c4f013ec 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -9968,12 +9968,12 @@ msgstr "" #: https//support.torproject.org/abuse/does-tor-get-much-abuse/ #: (content/abuse/how-much-abuse/contents+en.lrquestion.title) msgid "Does Tor get much abuse?" -msgstr "" +msgstr "آیا از تور زیاد سو استفاده می شود؟" #: https//support.torproject.org/abuse/does-tor-get-much-abuse/ #: (content/abuse/how-much-abuse/contents+en.lrquestion.description) msgid "Not much, in the grand scheme of things." -msgstr "" +msgstr "در قالب کلی، به صورت زیاد نه." #: https//support.torproject.org/abuse/does-tor-get-much-abuse/ #: (content/abuse/how-much-abuse/contents+en.lrquestion.description) @@ -10011,7 +10011,7 @@ msgstr "" #: https//support.torproject.org/abuse/tor-ip-for-legal-case/ #: (content/abuse/ip-legal-case/contents+en.lrquestion.title) msgid "I have questions about a Tor IP address for a legal case." -msgstr "" +msgstr "من سوالاتی در خصوص یک نشانی IP تور برای یک مورد حقوقی دارم." #: https//support.torproject.org/abuse/tor-ip-for-legal-case/ #: (content/abuse/ip-legal-case/contents+en.lrquestion.description) @@ -10060,6 +10060,8 @@ msgid "" "they assume that IP addresses equate to humans, and by banning the IP " "address they can ban the human." msgstr "" +"آن ها فکر می کنند که نشانی های IP مساوی با انسان ها هستند، و با مسدود کردن " +"نشانی IP می توانند جلوی یک شخص را بگیرند." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -10137,6 +10139,7 @@ msgstr "" #: (content/abuse/irc-ban/contents+en.lrquestion.description) msgid "Of course, not all IRC networks are trying to ban Tor nodes." msgstr "" +"البته، تمام شبکه های IRC در تلاش برای مسدود کردن گره های تور نمی باشند." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -10152,6 +10155,9 @@ msgid "" "millions of IPs that bad people can use is worth losing the contributions " "from the well-behaved Tor users." msgstr "" +"هر شبکه IRC به صورت مستقل باید تصمیم بگیرد که آیا مسدود کردن چندین IP از " +"میلیون ها IP که افراد بد می توانند استفاده کنند ارزش از دست دادن مشارکت " +"کاربرانی که از تور استفاده می کنند و به شکل مناسب رفتار می کنند را دارد." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 02 Apr '20

02 Apr '20

commit 4b37a5b834e648b49b4c20e180a4269bb566582a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 2 04:23:34 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index cd729d1c1c..c90887fcad 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -1552,7 +1552,7 @@ msgstr "" #: https//support.torproject.org/glossary/single-onion-service/ #: (content/glossary/single-onion-service/contents+en.lrword.term) msgid "single onion service" -msgstr "" +msgstr "تک سرویس پیازی" #: https//support.torproject.org/glossary/single-onion-service/ #: (content/glossary/single-onion-service/contents+en.lrword.definition) @@ -1834,6 +1834,9 @@ msgid "" "default and send all of its [traffic](../traffic) over [Tor](../tor-tor-" "network-core-tor)." msgstr "" +"پیام رسان تور یک برنامه گپ بین-پلتفرم است که قصد داشت به صورت پیش فرض امن " +"باشد و تمام [ترافیک](#traffic) خود را از [Tor](#tor-/-tor-network/-core-tor)" +" عبور دهد. " #: https//support.torproject.org/glossary/tor-messenger/ #: (content/glossary/tor-messenger/contents+en.lrword.definition) @@ -2956,6 +2959,8 @@ msgid "" "gpg: key 4E2C6E8793298290: public key \"Tor Browser Developers (signing key)" " <torbrowser(a)torproject.org>\" imported" msgstr "" +"gpg: key 4E2C6E8793298290: public key \"Tor Browser Developers (signing key)" +" <torbrowser(a)torproject.org>\" imported" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -2970,7 +2975,7 @@ msgstr "gpg: imported: 1" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "pub rsa4096 2014-12-15 [C] [expires: 2020-08-24]" -msgstr "" +msgstr "pub rsa4096 2014-12-15 [C] [expires: 2020-08-24]" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -2983,6 +2988,8 @@ msgid "" "uid [ unknown] Tor Browser Developers (signing key) " "<torbrowser(a)torproject.org>" msgstr "" +"uid [ unknown] Tor Browser Developers (signing key) " +"<torbrowser(a)torproject.org>" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3039,6 +3046,8 @@ msgid "" "gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-" "US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe" msgstr "" +"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-" +"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -8813,7 +8822,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.description) msgid "**CHANNEL:** #tor" -msgstr "" +msgstr "**کانال:** #tor" #: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.description) @@ -8950,7 +8959,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "### How to verify your nickname" -msgstr "" +msgstr "### چگونه نام مستعار خود را تایید کنید" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8958,6 +8967,8 @@ msgid "" "Then, to complete the registration and ultimately gain access to the #tor-" "project channel, your nickname must be **verified**." msgstr "" +"سپس، برای تکمیل ثبت نام و دسترسی داشتن به کانال tor-project#، نام مستعار شما" +" باید **تایید شده** باشد." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8965,11 +8976,13 @@ msgid "" "1. To verify your nick, open a new browser window and go to " "https://webchat.oftc.net/?channels=tor." msgstr "" +"1. برای تایید نام مستعار خود، یک پنجره مرورگر جدید را باز کنید و به " +"https://webchat.oftc.net/?channels=tor بروید." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "2. Log in with your IRC nickname and password." -msgstr "" +msgstr "2. نام مستعار و گذرواژه IRC خود را وارد کنید." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8978,11 +8991,14 @@ msgid "" " has happened. Look at the top of the page, and there will be a column " "called **Account**." msgstr "" +"3. به دنبال کلمه **تایید** بگردید و وارد شوید. ممکن است به نظر بیاید که " +"اتفاقی نیافتده است. به بالای صحفه نگاه کنید، و یک ستون به نام **حساب " +"کاربری** خواهد بود." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "4. Click on **Account**." -msgstr "" +msgstr "4. روی **حساب کاربری** کلیک کنید." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8990,11 +9006,12 @@ msgid "" "5. Click on the small sentence at the bottom of the square that says: Verify" " account." msgstr "" +"5. روی جمله کوتاه در پایین مربع که می گوید: تایید حساب کاربری کلیک کنید." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "6. Fill out the CAPTCHA that pops up, and click ok." -msgstr "" +msgstr "6. کپچایی که پدیدار می شود را پر کنید، سپس روی اوکی کلیک کنید." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9021,6 +9038,7 @@ msgstr "" #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "10. If all is well, you will receive a message that says:" msgstr "" +"10. اگر همه چیز به درستی پیش برود، شما پیامی دریافت خواهید کرد که می گوید:" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9045,7 +9063,7 @@ msgstr "````" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Your nick is verified!" -msgstr "" +msgstr "نام مستعار شما مورد تایید است!" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 01 Apr '20

01 Apr '20

commit 03d657adfa3b4de9a4dda7fb536615ac38435d86 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 2 03:53:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+fa.po b/contents+fa.po index db8e98355b..cd729d1c1c 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -1113,6 +1113,9 @@ msgid "" "](../tor-tor-network-core-tor) [traffic](../traffic) look random, so that it" " does not look like Tor or any other protocol." msgstr "" +"Obfs3 یک [حامل اتصال پذیر](../pluggable-transports) است که " +"[ترافیک](../traffic) [تور](../tor-tor-network-core-tor) را تصادفی نشان می " +"دهد، به صورتی که شبیه تور یا هیچ پروتکل دیگری نباشد." #: https//support.torproject.org/glossary/obfs3/ #: (content/glossary/obfs3/contents+en.lrword.definition)

1 0

[tor-browser-build/maint-9.0] Release preparations for 9.0.8
by sysrqb＠torproject.org 01 Apr '20

01 Apr '20

commit 3cbda0e84d2cb6b5a6c2e44339cc8932d3ead21d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 1 20:38:12 2020 +0000 Release preparations for 9.0.8 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ projects/tor-browser/config | 4 ++-- rbm.conf | 4 ++-- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2ea6db6..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 diff --git a/projects/firefox/config b/projects/firefox/config index 92e89d8..9b27590 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.6.0 + firefox_platform_version: 68.7.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9f6a50e..876559f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 9.0.8 -- April 7 2020 + * All Platforms + * Update Firefox to 68.7.0esr + * Bump NoScript to 11.0.23 + * Windows + OS X + Linux + * Bug 33771: Update some existing licenses and add Libevent license + Tor Browser 9.0.7 -- March 20 2020 * All Platforms * Bump NoScript to 11.0.19 diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3fbda88..6f2f436 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: eb06c8d548342ad623634cd5f40e7970e3e6c3218328c77c43716a8a5f61e680 + sha256sum: 3f046da13f487392f34858f8a5e2fc24d7d87ff19e98a3a7907f59baff8a3705 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index 89224e6..d621101 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0.7' + torbrowser_version: '9.0.8' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0.6 + - 9.0.7 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[stem/master] Port from distutils to setuptools
by atagar＠torproject.org 01 Apr '20

01 Apr '20

commit 7bccaa48b564f7eacb292fcb9029131a8d2e48d7 Author: msramalho <up201403027(a)fe.up.pt> Date: Mon Mar 30 21:53:57 2020 +0100 Port from distutils to setuptools --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 52b62dca..8e738a20 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ # * Contact package maintainers # * Announce the release (example: https://blog.torproject.org/blog/stem-release-11) -import distutils.core +import setuptools import os import sys import stem @@ -126,8 +126,9 @@ os.chdir(os.path.dirname(os.path.abspath(__file__))) with open('MANIFEST.in', 'w') as manifest_file: manifest_file.write(MANIFEST) + try: - distutils.core.setup( + setuptools.setup( name = 'stem-dry-run' if DRY_RUN else 'stem', version = stem.__version__, description = DRY_RUN_SUMMARY if DRY_RUN else SUMMARY, @@ -136,7 +137,7 @@ try: author = stem.__author__, author_email = stem.__contact__, url = stem.__url__, - packages = ['stem', 'stem.client', 'stem.descriptor', 'stem.interpreter', 'stem.response', 'stem.util'], + packages = setuptools.find_packages(exclude=["test*"]), keywords = 'tor onion controller', scripts = ['tor-prompt'], package_data = {

1 0

[stem/master] Fix difference in setuptools installation paths
by atagar＠torproject.org 01 Apr '20

01 Apr '20

commit 71184e68b86c54e4f87e5fb3ff70d437303c03e4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 30 19:11:41 2020 -0700 Fix difference in setuptools installation paths An assertion that we install all our expected files is failing... ====================================================================== FAIL: test_install ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 141, in <lambda> self.method = lambda test: self.result(test) # method that can be mixed into TestCases File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 208, in result test.fail(self._result.msg) AssertionError: The following files were expected to be in our installation but weren't. Maybe our setup.py needs to be updated? stem/directory.py stem/util/ed25519.py stem/descriptor/networkstatus.py ... The trouble is that setuptools adds an extra directory... distutil path: [install-prefix]/lib/python3.7/site-packages/stem/version.py setuptools path: [install-prefix]/lib/python3.7/site-packages/stem-1.8.0.dev0-py3.7.egg/stem/version.py Adjusting our glob to account for this difference. --- test/integ/installation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index 16d63538..fc1e4880 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -78,7 +78,7 @@ class TestInstallation(unittest.TestCase): if platform.python_implementation() == 'PyPy': site_packages_paths = glob.glob('%s/site-packages' % BASE_INSTALL_PATH) else: - site_packages_paths = glob.glob('%s/lib*/*/site-packages' % BASE_INSTALL_PATH) + site_packages_paths = glob.glob('%s/lib*/*/site-packages/*' % BASE_INSTALL_PATH) except Exception as exc: raise AssertionError("Unable to install with 'python setup.py install': %s" % exc)

1 0

[stem/master] Drop test_installs_all_modules
by atagar＠torproject.org 01 Apr '20

01 Apr '20

commit 14a26f666e9515c2c36b0d6adb7a96b89ba3a5ce Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 30 18:56:57 2020 -0700 Drop test_installs_all_modules This test checks that our setup.py includes all our modules within its packages line. The test no longer passes, but now that we're using setuptools it's unnecessary. ====================================================================== ERROR: test_installs_all_modules ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/installation.py", line 30, in test_installs_all_modules modules = json.loads(re.search('packages = (\\[.*\\])', self.setup_contents).group(1).replace("'", '"')) AttributeError: 'NoneType' object has no attribute 'group' --- setup.py | 2 +- test/unit/installation.py | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/setup.py b/setup.py index 968e42c0..eccd29eb 100644 --- a/setup.py +++ b/setup.py @@ -137,7 +137,7 @@ try: author = stem.__author__, author_email = stem.__contact__, url = stem.__url__, - packages = setuptools.find_packages(exclude=["test*"]), + packages = setuptools.find_packages(exclude=['test*']), keywords = 'tor onion controller', scripts = ['tor-prompt'], package_data = { diff --git a/test/unit/installation.py b/test/unit/installation.py index 4b2a795c..91b2a232 100644 --- a/test/unit/installation.py +++ b/test/unit/installation.py @@ -1,6 +1,4 @@ -import json import os -import re import unittest import test @@ -19,29 +17,6 @@ class TestInstallation(unittest.TestCase): else: self.skip_reason = '(only for git checkout)' - def test_installs_all_modules(self): - if self.skip_reason: - self.skipTest(self.skip_reason) - - # Modules cited my our setup.py looks like... - # - # packages = ['stem', 'stem.descriptor', 'stem.util'], - - modules = json.loads(re.search('packages = (\\[.*\\])', self.setup_contents).group(1).replace("'", '"')) - module_paths = dict([(m, os.path.join(test.STEM_BASE, m.replace('.', os.path.sep))) for m in modules]) - - for module, path in module_paths.items(): - if not os.path.exists(path): - self.fail("setup.py's module %s doesn't exist at %s" % (module, path)) - - for entry in os.walk(os.path.join(test.STEM_BASE, 'stem')): - directory = entry[0] - - if directory.endswith('__pycache__'): - continue - elif directory not in module_paths.values(): - self.fail("setup.py doesn't install %s" % directory) - def test_installs_all_data_files(self): if self.skip_reason: self.skipTest(self.skip_reason)

1 0

[stem/master] Improve almost duplicate code into for-loop
by atagar＠torproject.org 01 Apr '20

01 Apr '20

commit 59da1120f234b9c7c8f7a92e339693105da25fe7 Author: msramalho <up201403027(a)fe.up.pt> Date: Mon Mar 30 21:54:47 2020 +0100 Improve almost duplicate code into for-loop --- setup.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 8e738a20..968e42c0 100644 --- a/setup.py +++ b/setup.py @@ -153,8 +153,6 @@ try: ], ) finally: - if os.path.exists('MANIFEST.in'): - os.remove('MANIFEST.in') - - if os.path.exists('MANIFEST'): - os.remove('MANIFEST') + for filename in ['MANIFEST.in', 'MANIFEST']: + if os.path.exists(filename): + os.remove(filename)

1 0

[stem/master] Setuptools egg-info paths differ
by atagar＠torproject.org 01 Apr '20

01 Apr '20

commit e4bb1cc934b0e6011ca8dd14a3bdd51b5a9d30a6 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 30 19:17:06 2020 -0700 Setuptools egg-info paths differ Another test failure due to a minor difference between distutil and setuptools... ====================================================================== FAIL: test_install ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 141, in <lambda> self.method = lambda test: self.result(test) # method that can be mixed into TestCases File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 208, in result test.fail(self._result.msg) AssertionError: The following files weren't expected to be in our installation. EGG-INFO/scripts/tor-prompt EGG-INFO/dependency_links.txt EGG-INFO/PKG-INFO EGG-INFO/not-zip-safe EGG-INFO/top_level.txt EGG-INFO/SOURCES.txt Distutil has a single egg info file... [install-prefix]/lib/python3.7/site-packages/stem-1.8.0_dev-py3.7.egg-info Whereas setuptools creates several. --- test/integ/installation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index fc1e4880..55906288 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -44,7 +44,7 @@ def _assert_has_all_files(path): for root, dirnames, filenames in os.walk(path): for filename in filenames: - if not filename.endswith('.pyc') and not filename.endswith('egg-info'): + if not filename.endswith('.pyc') and 'EGG-INFO' not in root: installed.add(os.path.join(root, filename)[len(path) + 1:]) missing = expected.difference(installed)

1 0

[stem/master] Setuptools creates a dist directory
by atagar＠torproject.org 01 Apr '20

01 Apr '20

commit c132bf038a2bf547f32311a2efed7bb5e0ae35a2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 30 19:56:03 2020 -0700 Setuptools creates a dist directory Unfortunately setuptools creates a superfluous 'dist' directory that isn't removed with clean... https://github.com/pypa/setuptools/issues/1347 Working around the test failure it causes... ====================================================================== FAIL: test_sdist ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 141, in <lambda> self.method = lambda test: self.result(test) # method that can be mixed into TestCases File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 208, in result test.fail(self._result.msg) AssertionError: /home/atagar/Desktop/stem/dist already exists, maybe you manually ran 'python setup.py sdist'? --- test/integ/installation.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index 55906288..39b604bb 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -96,6 +96,9 @@ class TestInstallation(unittest.TestCase): if os.path.exists(BASE_INSTALL_PATH): shutil.rmtree(BASE_INSTALL_PATH) + if os.path.exists(DIST_PATH): + shutil.rmtree(DIST_PATH) + @asynchronous def test_sdist(dependency_pid): """ @@ -114,9 +117,6 @@ class TestInstallation(unittest.TestCase): elif not os.path.exists(git_dir): raise unittest.case.SkipTest('(not a git checkout)') - if os.path.exists(DIST_PATH): - raise AssertionError("%s already exists, maybe you manually ran 'python setup.py sdist'?" % DIST_PATH) - try: try: stem.util.system.call('%s setup.py sdist --dryrun' % PYTHON_EXE, timeout = 60, cwd = test.STEM_BASE) @@ -127,7 +127,12 @@ class TestInstallation(unittest.TestCase): # tarball has a prefix 'stem-[verion]' directory so stipping that out - with tarfile.open(os.path.join(DIST_PATH, 'stem-dry-run-%s.tar.gz' % stem.__version__)) as dist_tar: + dist_content = glob.glob('%s/*' % DIST_PATH) + + if len(dist_content) != 1: + raise AssertionError('We should only have a single file in our dist directory, but instead had: %s' % ', '.join(dist_content)) + + with tarfile.open(dist_content[0]) as dist_tar: tar_contents = ['/'.join(info.name.split('/')[1:]) for info in dist_tar.getmembers() if info.isfile()] issues = [] @@ -137,7 +142,7 @@ class TestInstallation(unittest.TestCase): issues.append(' * %s is missing from our release tarball' % path) for path in tar_contents: - if path not in git_contents and path not in ['MANIFEST.in', 'PKG-INFO']: + if path not in git_contents and path not in ['MANIFEST.in', 'PKG-INFO', 'setup.cfg'] and not path.startswith('stem_dry_run.egg-info'): issues.append(" * %s isn't expected in our release tarball" % path) if issues:

1 0