October 2019 - tor-commits - lists.torproject.org

[translation/torbutton-branddtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_completed
by translation＠torproject.org 03 Oct '19

03 Oct '19

commit 935bef64bed096e5e611f7bb29e5b788d2faced6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 3 22:50:46 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_… --- mk/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/brand.dtd b/mk/brand.dtd index 63d055ae9..30e201ebf 100644 --- a/mk/brand.dtd +++ b/mk/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Browser"> -<!ENTITY trademarkInfo.part1 ""> +<!ENTITY trademarkInfo.part1 "'Tor' и 'Onion Logo' се регистрирани трговски марки на Tor Project, Inc.">  <!ENTITY plugins.installed.find "Кликни за вчитување на инсталираните системски приклучоци">

1 0

[bridgedb/develop] Replace PyCrypto with PyCryptodome.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 75471cdab181759d4e659c3d16265e437151428a Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 9 18:15:18 2019 -0700 Replace PyCrypto with PyCryptodome. PyCrypto has unfixed security vulnerabilities and is no longer maintained. PyCryptodome is a (mostly) drop-in replacement, which does not have these vulnerabilities. Let's use PyCryptodome instead. --- .travis.requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index e6eaf10..5c1e433 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -21,8 +21,8 @@ Babel==0.9.6 BeautifulSoup==3.2.1 Mako==0.8.1 ipaddr==2.1.11 -pycrypto==2.6.1 pygeoip==0.2.7 +PyCryptodome==3.8.2 gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 diff --git a/requirements.txt b/requirements.txt index d7713df..b64aec3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,9 +3,9 @@ BeautifulSoup==3.2.1 Mako==0.8.1 Twisted==16.1.1 ipaddr==2.1.11 -pycrypto==2.6.1 pyOpenSSL==16.2.0 pygeoip==0.2.7 +PyCryptodome==3.8.2 gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1

1 0

[bridgedb/develop] Update pyOpenSSL to version 17.5.0.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 935c3eaa7ad0287d15b276b1098fd4eeed29dd56 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 9 18:28:18 2019 -0700 Update pyOpenSSL to version 17.5.0. This fixes security vulnerabilities. --- .travis.yml | 18 +++++++++--------- requirements.txt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26e4d28..9d30d10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,27 +34,27 @@ env: - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | sha256sum | cut -d ' ' -f 1)" matrix: # What we're running on polyanthum - - TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0 + - TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0 # Debian Stretch - - TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0 + - TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 # Debian experimental (all other versions of Debian have the same dependency versions right now) - - TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0 + - TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0 matrix: include: - python: "pypy" - env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0 + env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0 - python: "pypy" - env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0 + env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 allow_failures: - python: "2.7" - env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0 + env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 - python: "2.7" - env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0 + env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0 - python: "pypy" - env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0 + env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0 - python: "pypy" - env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0 + env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 fast_finish: true before_install: diff --git a/requirements.txt b/requirements.txt index b64aec3..0ceccca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ BeautifulSoup==3.2.1 Mako==0.8.1 Twisted==16.1.1 ipaddr==2.1.11 -pyOpenSSL==16.2.0 +pyOpenSSL==17.5.0 pygeoip==0.2.7 PyCryptodome==3.8.2 gnupg==2.0.1

1 0

[bridgedb/develop] Import rfc822 directly instead of over detour.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 15b8e0df097e2cf98c13faf6aabc3236520fa14b Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 08:59:50 2019 -0700 Import rfc822 directly instead of over detour. Some of our code got the rfc822 module over a detour, by importing it through twisted.mail.smtp. This is dangerous and only works if twisted.mail.smtp actually does import rfc822 -- which newer versions stopped doing. We're fixing this by doing what we should have been doing all along: importing the module ourselves. --- bridgedb/distributors/email/server.py | 3 ++- bridgedb/test/test_email_dkim.py | 2 +- bridgedb/test/test_email_server.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bridgedb/distributors/email/server.py b/bridgedb/distributors/email/server.py index 229f118..8bd4b36 100644 --- a/bridgedb/distributors/email/server.py +++ b/bridgedb/distributors/email/server.py @@ -52,6 +52,7 @@ from __future__ import unicode_literals import logging import io import socket +import rfc822 from twisted.internet import defer from twisted.internet import reactor @@ -254,7 +255,7 @@ class SMTPMessage(object): for line in self.lines: rawMessage.writelines(unicode(line.decode('utf8')) + u'\n') rawMessage.seek(0) - return smtp.rfc822.Message(rawMessage) + return rfc822.Message(rawMessage) class SMTPIncomingDelivery(smtp.SMTP): diff --git a/bridgedb/test/test_email_dkim.py b/bridgedb/test/test_email_dkim.py index dc4c53b..be34370 100644 --- a/bridgedb/test/test_email_dkim.py +++ b/bridgedb/test/test_email_dkim.py @@ -12,8 +12,8 @@ """Unittests for the :mod:`bridgedb.distributors.email.dkim` module.""" import io +import rfc822 -from twisted.mail.smtp import rfc822 from twisted.trial import unittest from bridgedb.distributors.email import dkim diff --git a/bridgedb/test/test_email_server.py b/bridgedb/test/test_email_server.py index edf2539..bc331f4 100644 --- a/bridgedb/test/test_email_server.py +++ b/bridgedb/test/test_email_server.py @@ -16,6 +16,7 @@ from __future__ import print_function import socket import string import types +import rfc822 from twisted.python import log from twisted.internet import defer @@ -25,7 +26,6 @@ from twisted.mail.smtp import SMTPBadRcpt from twisted.mail.smtp import SMTPBadSender from twisted.mail.smtp import User from twisted.mail.smtp import Address -from twisted.mail.smtp import rfc822 from twisted.test import proto_helpers from twisted.trial import unittest

1 0

[bridgedb/develop] Update libraries to their latest versions.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit bd847b3409cf0fa2fd9854d92383e43994739893 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 14:38:50 2019 -0700 Update libraries to their latest versions. This patch updates all of our less problematic libraries to their latest respective versions. We can determine a library's latest version by running: yolk -V LIBRARY You can run 'pip install yolk' if you don't have the tool installed already. --- .test.requirements.txt | 8 ++++---- .travis.requirements.txt | 28 ++++++++++++++-------------- requirements.txt | 24 ++++++++++++------------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index ad5342f..2b6da2f 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -5,10 +5,10 @@ # $ pip install -r .test.requirements.txt # $ make coverage # -coverage==4.2 -mechanize==0.2.5 -pep8==1.5.7 +coverage==4.5.4 +mechanize==0.4.3 +pep8==1.7.1 # pylint must be pinned until pylint bug #203 is fixed. See # https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages… pylint==1.1.0 -sure==1.2.2 +sure==1.4.11 diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 5c1e433..9d69ab7 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -13,19 +13,19 @@ # $ make coverage # #------------------------------------------------------------------------------ -coverage==4.2 -coveralls==1.2.0 -mechanize==0.2.5 -sure==1.2.2 -Babel==0.9.6 +coverage==4.5.4 +coveralls==1.8.2 +mechanize==0.4.3 +sure==1.4.11 +Babel==2.7.0 BeautifulSoup==3.2.1 -Mako==0.8.1 -ipaddr==2.1.11 -pygeoip==0.2.7 -PyCryptodome==3.8.2 -gnupg==2.0.1 -pillow>=2.6.1 -qrcode==5.0.1 -service_identity==14.0.0 +Mako==1.1.0 +ipaddr==2.2.0 +pygeoip==0.3.2 +PyCryptodome==3.9.0 +gnupg==2.3.1 +pillow==6.1.0 +qrcode==6.1 +service_identity==18.1.0 git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a… -zope.interface==3.6.1 +zope.interface==4.6.0 diff --git a/requirements.txt b/requirements.txt index 0ceccca..1b25a90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,14 @@ -Babel==2.5.1 +Babel==2.7.0 BeautifulSoup==3.2.1 -Mako==0.8.1 -Twisted==16.1.1 -ipaddr==2.1.11 -pyOpenSSL==17.5.0 -pygeoip==0.2.7 -PyCryptodome==3.8.2 -gnupg==2.0.1 -pillow>=2.6.1 -qrcode==5.0.1 -service_identity==14.0.0 +Mako==1.1.0 +Twisted==16.6.0 +ipaddr==2.2.0 +pyOpenSSL==19.0.0 +pygeoip==0.3.2 +PyCryptodome==3.9.0 +gnupg==2.3.1 +pillow>=6.1.0 +qrcode==6.1 +service_identity==18.1.0 git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a… -zope.interface==3.6.1 +zope.interface==4.6.0

1 0

[bridgedb/develop] Adapt to sure's new API.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 5d3a30aceaaf40507cfd63239183edbf27772abb Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 14:59:45 2019 -0700 Adapt to sure's new API. --- bridgedb/test/test_persistent.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py index 95abf61..858ad1a 100644 --- a/bridgedb/test/test_persistent.py +++ b/bridgedb/test/test_persistent.py @@ -89,7 +89,7 @@ class StateTest(unittest.TestCase): this(self.state).should.have.property('statefile') def test_persistent_getState(self): - persistent.should.have.property('_getState').being(callable) + persistent._getState.should.be.callable this(persistent._getState()).should.be.a(persistent.State) def test_getStateFor(self): @@ -102,10 +102,10 @@ class StateTest(unittest.TestCase): the(self.state.statefile).should.be.a(str) def test_existsSave(self): - this(self.state).should.have.property('save').being(callable) + self.state.save.should.be.callable def test_existsLoad(self): - persistent.should.have.property('load').being(callable) + persistent.load.should.be.callable def test_persistent_state(self): the(persistent._state).should.be.a(persistent.State) @@ -152,7 +152,7 @@ class StateTest(unittest.TestCase): the(thatConfig.LOGFILE).must.equal(42) the(thatState).should.have.property('useChangedSettings') - the(thatState.useChangedSettings).should.be(callable) + thatState.useChangedSettings.should.be.callable thatState.useChangedSettings(thatConfig) the(thatState.FOO).should.equal('fuuuuu')

1 0

[bridgedb/develop] Send CI notifications to phw instead of sysrqb.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit f24ef482e8a11beeb8ab4e330f47e82b5e9c0db8 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 15:45:33 2019 -0700 Send CI notifications to phw instead of sysrqb. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d30d10..9ec71fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ notifications: on_failure: always email: recipients: - - sysrqb(a)torproject.org + - phw(a)torproject.org on_success: never on_failure: change

1 0

[bridgedb/develop] Update stem to version 1.7.1.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 434a30262cc2afabb69fb7bbf2d04c51c9082de4 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 16:32:21 2019 -0700 Update stem to version 1.7.1. There's no reason to use the Tor Project's git repository. --- .travis.requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 2f8d861..0669dc4 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -28,5 +28,5 @@ gnupg==2.3.1 pillow==6.1.0 qrcode==6.1 service_identity==18.1.0 -git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7 +stem==1.7.1 zope.interface==4.6.0 diff --git a/requirements.txt b/requirements.txt index 3bb970e..ebf9c96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,5 @@ gnupg==2.3.1 pillow>=6.1.0 qrcode==6.1 service_identity==18.1.0 -git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7 +stem==1.7.1 zope.interface==4.6.0

1 0

[bridgedb/develop] Order dependencies alphabetically.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit c833e9766cfb414b5f4050eb28fba93cb245d976 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 16:37:13 2019 -0700 Order dependencies alphabetically. This makes it easier to create diffs between our various requirements files. --- .travis.requirements.txt | 12 ++++++------ requirements.txt | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 0669dc4..4d451da 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -13,20 +13,20 @@ # $ make coverage # #------------------------------------------------------------------------------ -coverage==4.5.4 -coveralls==1.8.2 -mechanize==0.4.3 -sure==1.4.11 Babel==2.7.0 BeautifulSoup==3.2.1 Mako==1.1.0 -ipaddr==2.2.0 -pygeoip==0.3.2 PyCryptodome==3.9.0 Twisted==19.7.0 +coverage==4.5.4 +coveralls==1.8.2 gnupg==2.3.1 +ipaddr==2.2.0 +mechanize==0.4.3 pillow==6.1.0 +pygeoip==0.3.2 qrcode==6.1 service_identity==18.1.0 stem==1.7.1 +sure==1.4.11 zope.interface==4.6.0 diff --git a/requirements.txt b/requirements.txt index ebf9c96..05d5444 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ Babel==2.7.0 BeautifulSoup==3.2.1 Mako==1.1.0 +PyCryptodome==3.9.0 Twisted==19.7.0 +gnupg==2.3.1 ipaddr==2.2.0 +pillow>=6.1.0 pyOpenSSL==19.0.0 pygeoip==0.3.2 -PyCryptodome==3.9.0 -gnupg==2.3.1 -pillow>=6.1.0 qrcode==6.1 service_identity==18.1.0 stem==1.7.1

1 0

[bridgedb/develop] Update Twisted to 19.7.0.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 4ee54ce81a5ef7466067f3637258e4aa6de541bc Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 16:27:11 2019 -0700 Update Twisted to 19.7.0. In the process, we can also get rid of our build matrix because there's no longer a need to test different Twisted (or pyOpenSSL) versions. We had to fix a number of issues to support the latest Twisted version: * Change Reactor() to createReactor() in a unit test. * Invoke unit tests with "-m twisted.trial" instead of "$(TRIAL)" to unbreak our code coverage reporting. * Use absolute paths for our translations because otherwise our new unit test invocation with "-m twisted.trial" would look in the wrong place and fail. --- .travis.requirements.txt | 1 + .travis.yml | 26 +------------------------- Makefile | 2 +- bridgedb/distributors/https/server.py | 2 +- bridgedb/test/test_crypto.py | 2 +- bridgedb/translations.py | 2 +- requirements.txt | 2 +- scripts/install-dependencies | 5 ++--- 8 files changed, 9 insertions(+), 33 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 9d69ab7..2f8d861 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -23,6 +23,7 @@ Mako==1.1.0 ipaddr==2.2.0 pygeoip==0.3.2 PyCryptodome==3.9.0 +Twisted==19.7.0 gnupg==2.3.1 pillow==6.1.0 qrcode==6.1 diff --git a/.travis.yml b/.travis.yml index 9ec71fc..c0499b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,30 +32,6 @@ env: # https://stackoverflow.com/questions/2192323/what-is-the-python-egg-cache-py… # https://github.com/pypa/virtualenv/issues/459 - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | sha256sum | cut -d ' ' -f 1)" - matrix: - # What we're running on polyanthum - - TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0 - # Debian Stretch - - TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 - # Debian experimental (all other versions of Debian have the same dependency versions right now) - - TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0 - -matrix: - include: - - python: "pypy" - env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0 - - python: "pypy" - env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 - allow_failures: - - python: "2.7" - env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 - - python: "2.7" - env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0 - - python: "pypy" - env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0 - - python: "pypy" - env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 - fast_finish: true before_install: - sudo apt-get update @@ -63,7 +39,7 @@ before_install: - chmod -R og-w $PYTHON_EGG_CACHE install: - - TWISTED_VERSION=$TWISTED_VERSION PYOPENSSL_VERSION=$PYOPENSSL_VERSION ./scripts/install-dependencies + - ./scripts/install-dependencies - make install # Start a BridgeDB instance before running the tests: diff --git a/Makefile b/Makefile index 428f004..08c2fbd 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ ifeq ($(PYTHON_IMPLEMENTATION),PyPy) @echo "Detected PyPy... not running coverage." python setup.py test else - coverage run --rcfile=".coveragerc" $(TRIAL) ./bridgedb/test/test_*.py + coverage run --rcfile=".coveragerc" -m twisted.trial ./bridgedb/test/test_*.py coverage report --rcfile=".coveragerc" endif diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py index e5df7da..81bc353 100644 --- a/bridgedb/distributors/https/server.py +++ b/bridgedb/distributors/https/server.py @@ -69,7 +69,7 @@ from bridgedb.util import replaceControlChars #: The path to the HTTPS distributor's web templates. (Should be the #: "templates" directory in the same directory as this file.) -TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates') +TEMPLATE_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'templates') # Setting `filesystem_checks` to False is recommended for production servers, # due to potential speed increases. This means that the atimes of the Mako diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py index 10974bb..7a34671 100644 --- a/bridgedb/test/test_crypto.py +++ b/bridgedb/test/test_crypto.py @@ -329,7 +329,7 @@ class SSLVerifyingContextFactoryTests(unittest.TestCase, def setUp(self): """Create a fake reactor for these tests.""" - self.reactor = self.Reactor() + self.reactor = self.createReactor() self.url = 'https://www.example.com/someresource.html#andatag' def test_getHostnameFromURL(self): diff --git a/bridgedb/translations.py b/bridgedb/translations.py index f3e6ed4..7429b60 100644 --- a/bridgedb/translations.py +++ b/bridgedb/translations.py @@ -17,7 +17,7 @@ from bridgedb import safelog from bridgedb.parse import headers -TRANSLATIONS_DIR = os.path.join(os.path.dirname(__file__), 'i18n') +TRANSLATIONS_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'i18n') def getFirstSupportedLang(langs): diff --git a/requirements.txt b/requirements.txt index 1b25a90..3bb970e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Babel==2.7.0 BeautifulSoup==3.2.1 Mako==1.1.0 -Twisted==16.6.0 +Twisted==19.7.0 ipaddr==2.2.0 pyOpenSSL==19.0.0 pygeoip==0.3.2 diff --git a/scripts/install-dependencies b/scripts/install-dependencies index cffef18..923b51e 100755 --- a/scripts/install-dependencies +++ b/scripts/install-dependencies @@ -31,11 +31,10 @@ done $SUDO $APT_GET install ${APT_FLAGS} ${MISSING} -# When running on Travis, be sure that environment variables are passed from -# .travis.yml to this script: +# When running on Travis, we are installing a few extra packages, e.g., to +# determine code coverage. if [ "$TRAVIS" == "true" ] ; then $PIP install $PIP_FLAGS -r "$HERE/../.travis.requirements.txt" - $PIP install $PIP_FLAGS "Twisted==$TWISTED_VERSION" "pyOpenSSL==$PYOPENSSL_VERSION" else $PIP install $PIP_FLAGS -r "$HERE/../requirements.txt" fi

1 0