Improve installation scripts.

Fix bug reported by pazis.
torproject · Feb 7, 2020 · 7a19118 · 7a19118
1 parent cb0cbfd
commit 7a19118
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/onionbalance/__init__.py b/onionbalance/__init__.py
@@ -6,6 +6,6 @@
 __url__ = "https://github.com/DonnchaC/onionbalance"
 __license__ = "GPL"
 
-from ._version import get_versions
+from onionbalance._version import get_versions
 __version__ = get_versions()['version']
 del get_versions
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,9 @@
+setproctitle>=1.1.9
+
 stem>=1.8
 pyyaml>=4.2b1
-pycrypto==2.6.1
-future==0.14.3
-sphinxcontrib-autoprogram==0.1.2
-setproctitle==1.1.9
+cryptography>=2.5
+
+pycrypto>=2.6.1
+future>=0.14.3
+sphinxcontrib-autoprogram>=0.1.2
diff --git a/setup.cfg b/setup.cfg
@@ -8,6 +8,6 @@ universal=1
 VCS = git
 style = pep440
 versionfile_source = onionbalance/_version.py
-versionfile_build = None
+versionfile_build = onionbalance/_version.py
 tag_prefix =''
 parentdir_prefix = onionbalance-
diff --git a/setup.py b/setup.py
@@ -43,11 +43,12 @@ def read(*names, **kwargs):
     keywords='tor',
     install_requires=[
         'setuptools',
-        'stem>=1.4.0-dev',
-        'PyYAML>=3.11',
+        'stem>=1.8',
+        'PyYAML>=4.2b1',
         'pycrypto>=2.6.1',
         'future>=0.14.0',
         'setproctitle',
+        'cryptography>=2.5',
         ],
     tests_require=['tox', 'pytest-mock', 'pytest', 'mock', 'pexpect'],
     package_data={'onionbalance.config_generator': ['data/*']},