Selaa lähdekoodia

Add dependencies for running test_greenthreads and test_swift on python3.

Jelmer Vernooij 9 vuotta sitten
vanhempi
commit
fa415c3dbf
2 muutettua tiedostoa jossa 7 lisäystä ja 12 poistoa
  1. 3 3
      .travis.yml
  2. 4 9
      setup.py

+ 3 - 3
.travis.yml

@@ -7,11 +7,11 @@ matrix:
     - python: "2.7"
       env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
     - python: "pypy"
-      env: TEST_REQUIRE="fastimport"
+      env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
     - python: "3.4"
-      env: TEST_REQUIRE="gevent greenlet fastimport"
+      env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
     - python: "3.5"
-      env: TEST_REQUIRE="gevent greenlet fastimport"
+      env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
 cache:
   directories:
     - $HOME/.cache/pip

+ 4 - 9
setup.py

@@ -46,15 +46,10 @@ if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
         if l.startswith('Xcode') and int(l.split()[1].split('.')[0]) >= 4:
             os.environ['ARCHFLAGS'] = ''
 
-if sys.version_info[0] == 2:
-    tests_require = ['fastimport']
-    if not '__pypy__' in sys.modules and not sys.platform == 'win32':
-        tests_require.extend([
-            'gevent', 'geventhttpclient', 'mock', 'setuptools>=17.1'])
-else:
-    # fastimport, gevent, geventhttpclient are not available for PY3
-    # mock only used for test_swift, which requires gevent/geventhttpclient
-    tests_require = []
+tests_require = ['fastimport']
+if not '__pypy__' in sys.modules and not sys.platform == 'win32':
+    tests_require.extend([
+        'gevent', 'geventhttpclient', 'mock', 'setuptools>=17.1'])
 
 if sys.version_info[0] > 2 and sys.platform == 'win32':
     # C Modules don't build for python3 windows, and prevent tests from running