New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DO NOT MERGE Python 3 test #19116

Closed

millerdev wants to merge 718 commits into master from dm/py3test

Contributor

millerdev commented Jan 11, 2018 •

edited

Loading

For python 3 tests

Might need to restart the build after the docker hub build is finished. It's still queued as I'm writing this.

millerdev added Open for review: do not merge product/invisible labels

millerdev changed the title ~~DO NOT MERGE~~ DO NOT MERGE Python 3 test

stickler-ci reviewed

View reviewed changes

corehq/apps/domain/forms.py Outdated

@@ @@ -1228,8 +1229,8 @@ def _get_uppercase_unicode_regexp(): @@
                   upper_group = u"".join(uppers)
                   return re.compile(upper_group, re.UNICODE)
-              SPECIAL = re.compile(ur"\W", re.UNICODE)
-              NUMBER = re.compile(ur"\d", re.UNICODE)  # are there other unicode numerals?
+              SPECIAL = re.compile(r"\W", re.UNICODE)

stickler-ci Jan 30, 2018

E305 expected 2 blank lines after class or function definition, found 1

gcapalbo commented Aug 8, 2018

@nickpell fyi we can't completely delete the touchforms submodule until all the commcare-cloud references are removed. everything is mentioned in https://trello.com/c/jGzPtKKR/120-remove-references-to-touchforms

Contributor

nickpell commented Aug 8, 2018

@gcapalbo 👍 I'm treating this as an experimental branch, not to be merged

This was referenced Aug 16, 2018

update docker so py3 tests can be run in travis #21556

Merged

unblock python 3 tests #21557

Merged

This was referenced Aug 26, 2018

add py3 Dockerfile #21647

Merged

for py3 tests #21648

Merged

stickler-ci reviewed

View reviewed changes

custom/openclinica/utils.py Outdated

-                  u'eric_'
-                  >>> mk_oc_username('I3#')
-                  u'I3___'
+                  >>> mk_oc_username('eric.idle@montypython.com') if six.PY3 else mk_oc_username('eric.idle@montypython.com').encode('utf-8')

stickler-ci Aug 26, 2018

E501 line too long (127 > 115 characters)

stickler-ci reviewed

View reviewed changes

corehq/apps/app_manager/xform_builder.py Outdated

-                      u'foo-hint'
+                      >>> XFormBuilder.get_text_id('foo') if six.PY3 else XFormBuilder.get_text_id('foo').encode('utf-8')
+                      'foo-label'
+                      >>> XFormBuilder.get_text_id('foo', ['bar']) if six.PY3 else XFormBuilder.get_text_id('foo', ['bar']).encode('utf-8')

stickler-ci Aug 26, 2018

E501 line too long (125 > 115 characters)

corehq/apps/app_manager/xform_builder.py Outdated

+                      'foo-label'
+                      >>> XFormBuilder.get_text_id('foo', ['bar']) if six.PY3 else XFormBuilder.get_text_id('foo', ['bar']).encode('utf-8')
+                      'bar/foo-label'
+                      >>> XFormBuilder.get_text_id('foo', ['bar', 'baz']) if six.PY3 else XFormBuilder.get_text_id('foo', ['bar', 'baz']).encode('utf-8')

stickler-ci Aug 26, 2018

E501 line too long (139 > 115 characters)

corehq/apps/app_manager/xform_builder.py Outdated

+                      'bar/foo-label'
+                      >>> XFormBuilder.get_text_id('foo', ['bar', 'baz']) if six.PY3 else XFormBuilder.get_text_id('foo', ['bar', 'baz']).encode('utf-8')
+                      'bar/baz/foo-label'
+                      >>> XFormBuilder.get_text_id('foo', ['bar', 'baz'], 'choice1') if six.PY3 else XFormBuilder.get_text_id('foo', ['bar', 'baz'], 'choice1').encode('utf-8')

stickler-ci Aug 26, 2018

E501 line too long (161 > 115 characters)

corehq/apps/app_manager/xform_builder.py Outdated

+                      'bar/baz/foo-label'
+                      >>> XFormBuilder.get_text_id('foo', ['bar', 'baz'], 'choice1') if six.PY3 else XFormBuilder.get_text_id('foo', ['bar', 'baz'], 'choice1').encode('utf-8')
+                      'bar/baz/foo-choice1-label'
+                      >>> XFormBuilder.get_text_id('foo', is_hint=True) if six.PY3 else XFormBuilder.get_text_id('foo', is_hint=True).encode('utf-8')

stickler-ci Aug 26, 2018

E501 line too long (135 > 115 characters)

corehq/apps/app_manager/xform_builder.py Outdated

-                      u'/data/bar/baz/foo'
+                      >>> XFormBuilder.get_data_ref('foo') if six.PY3 else XFormBuilder.get_data_ref('foo').encode('utf-8')
+                      '/data/foo'
+                      >>> XFormBuilder.get_data_ref('foo', ['bar']) if six.PY3 else XFormBuilder.get_data_ref('foo', ['bar']).encode('utf-8')

stickler-ci Aug 26, 2018

E501 line too long (127 > 115 characters)

corehq/apps/app_manager/xform_builder.py Outdated

+                      '/data/foo'
+                      >>> XFormBuilder.get_data_ref('foo', ['bar']) if six.PY3 else XFormBuilder.get_data_ref('foo', ['bar']).encode('utf-8')
+                      '/data/bar/foo'
+                      >>> XFormBuilder.get_data_ref('foo', ['bar', 'baz']) if six.PY3 else XFormBuilder.get_data_ref('foo', ['bar', 'baz']).encode('utf-8')

stickler-ci Aug 26, 2018

E501 line too long (141 > 115 characters)

corehq/apps/app_manager/xform_builder.py Outdated

-                      u'{http://openrosa.org/javarosa}constraintMsg'
-                      >>> xform.get_namespaced('constraint')
-                      u'constraint'
+                      >>> xform.get_namespaced('jr:constraintMsg') if six.PY3 else xform.get_namespaced('jr:constraintMsg').encode('utf-8')

stickler-ci Aug 26, 2018

E501 line too long (125 > 115 characters)

nickpell mentioned this pull request

a bunch more py3 test fixes! #21676

Merged

stickler-ci reviewed

View reviewed changes

corehq/apps/locations/migrations/0002_auto_20160420_2105.py Outdated

@@ @@ -15,13 +15,13 @@ class Migration(migrations.Migration): @@
                       migrations.AddField(
                           model_name='locationtype',
                           name='_expand_from',
-                          field=models.ForeignKey(related_name='+', db_column=b'expand_from', to='locations.LocationType', null=True, on_delete=models.CASCADE),
+                          field=models.ForeignKey(related_name='+', db_column='expand_from', to='locations.LocationType', null=True, on_delete=models.CASCADE),

stickler-ci Aug 28, 2018

E501 line too long (145 > 115 characters)

corehq/form_processor/migrations/0003_auto_20151104_2226.py Outdated

@@ @@ -15,7 +15,7 @@ class Migration(migrations.Migration): @@
                       migrations.AlterField(
                           model_name='xformattachmentsql',
                           name='xform',
-                          field=models.ForeignKey(to='form_processor.XFormInstanceSQL', to_field=b'form_uuid', on_delete=models.CASCADE),
+                          field=models.ForeignKey(to='form_processor.XFormInstanceSQL', to_field='form_uuid', on_delete=models.CASCADE),

stickler-ci Aug 28, 2018

E501 line too long (122 > 115 characters)

corehq/form_processor/migrations/0006_commcarecaseindexsql.py Outdated

@@ @@ -21,7 +21,7 @@ class Migration(migrations.Migration): @@
                               ('referenced_id', models.CharField(max_length=255)),
                               ('referenced_type', models.CharField(max_length=255)),
                               ('relationship', models.PositiveSmallIntegerField(choices=[(0, b'child'), (1, b'extension')])),
-                              ('case', models.ForeignKey(to='form_processor.CommCareCaseSQL', to_field=b'case_uuid', db_column=b'case_uuid', db_index=False, on_delete=models.CASCADE)),
+                              ('case', models.ForeignKey(to='form_processor.CommCareCaseSQL', to_field='case_uuid', db_column='case_uuid', db_index=False, on_delete=models.CASCADE)),

stickler-ci Aug 28, 2018

E501 line too long (168 > 115 characters)

corehq/form_processor/migrations/0007_index_case_uuid_on_commcarecaseindex.py Outdated

@@ @@ -15,7 +15,7 @@ class Migration(migrations.Migration): @@
                       migrations.AlterField(
                           model_name='commcarecaseindexsql',
                           name='case',
-                          field=models.ForeignKey(to='form_processor.CommCareCaseSQL', db_column=b'case_uuid', to_field=b'case_uuid', on_delete=models.CASCADE),
+                          field=models.ForeignKey(to='form_processor.CommCareCaseSQL', db_column='case_uuid', to_field='case_uuid', on_delete=models.CASCADE),

stickler-ci Aug 28, 2018

E501 line too long (144 > 115 characters)

corehq/form_processor/migrations/0008_add_index_for_caseforms_case_uuid.py Outdated

@@ @@ -17,7 +17,7 @@ class Migration(migrations.Migration): @@
                           fields=[
                               ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                               ('form_uuid', models.CharField(max_length=255)),
-                              ('case', models.ForeignKey(to='form_processor.CommCareCaseSQL', to_field=b'case_uuid', db_column=b'case_uuid', db_index=False, on_delete=models.CASCADE)),
+                              ('case', models.ForeignKey(to='form_processor.CommCareCaseSQL', to_field='case_uuid', db_column='case_uuid', db_index=False, on_delete=models.CASCADE)),

stickler-ci Aug 28, 2018

E501 line too long (168 > 115 characters)

corehq/form_processor/migrations/0036_cleanup_models.py Outdated

                           preserve_default=True,
                       ),
                       migrations.AlterField(
                           model_name='commcarecaseindexsql',
                           name='case',
-                          field=models.ForeignKey(related_query_name=b'index', related_name='index_set', to_field=b'case_id', to='form_processor.CommCareCaseSQL', on_delete=models.CASCADE),
+                          field=models.ForeignKey(related_query_name=b'index', related_name='index_set', to_field='case_id', to='form_processor.CommCareCaseSQL', on_delete=models.CASCADE),

stickler-ci Aug 28, 2018

E501 line too long (174 > 115 characters)

corehq/form_processor/migrations/0036_cleanup_models.py Outdated

                           preserve_default=True,
                       ),
                       # ---- end rename commcarecasesql.case_uuid rename
                       migrations.AlterField(
                           model_name='caseattachmentsql',
                           name='case',
-                          field=models.ForeignKey(related_query_name=b'attachment', related_name='attachment_set', to_field=b'case_id', to='form_processor.CommCareCaseSQL', on_delete=models.CASCADE),
+                          field=models.ForeignKey(related_query_name=b'attachment', related_name='attachment_set', to_field='case_id', to='form_processor.CommCareCaseSQL', on_delete=models.CASCADE),

stickler-ci Aug 28, 2018

E501 line too long (184 > 115 characters)

corehq/form_processor/migrations/0036_cleanup_models.py Outdated

                           preserve_default=True,
                       ),
                       migrations.AlterField(
                           model_name='xformattachmentsql',
                           name='form',
-                          field=models.ForeignKey(related_query_name=b'attachment', related_name='attachment_set', to_field=b'form_id', to='form_processor.XFormInstanceSQL', on_delete=models.CASCADE),
+                          field=models.ForeignKey(related_query_name=b'attachment', related_name='attachment_set', to_field='form_id', to='form_processor.XFormInstanceSQL', on_delete=models.CASCADE),

stickler-ci Aug 28, 2018

E501 line too long (185 > 115 characters)

corehq/form_processor/migrations/0036_cleanup_models.py Outdated

@@ @@ -217,7 +217,7 @@ class Migration(migrations.Migration): @@
                       migrations.AlterField(
                           model_name='casetransaction',
                           name='case',
-                          field=models.ForeignKey(related_query_name=b'transaction', related_name='transaction_set', to_field=b'case_id', to='form_processor.CommCareCaseSQL', on_delete=models.CASCADE),
+                          field=models.ForeignKey(related_query_name=b'transaction', related_name='transaction_set', to_field='case_id', to='form_processor.CommCareCaseSQL', on_delete=models.CASCADE),

stickler-ci Aug 28, 2018

E501 line too long (186 > 115 characters)

corehq/form_processor/migrations/0039_auto_20151130_1748.py Outdated

@@ @@ -20,7 +20,7 @@ class Migration(migrations.Migration): @@
                               ('section_id', models.CharField(max_length=100, db_index=True)),
                               ('balance', models.IntegerField(default=0)),
                               ('last_modified', models.DateTimeField(auto_now=True)),
-                              ('case', models.ForeignKey(to='form_processor.CommCareCaseSQL', to_field=b'case_id', on_delete=models.CASCADE)),
+                              ('case', models.ForeignKey(to='form_processor.CommCareCaseSQL', to_field='case_id', on_delete=models.CASCADE)),

stickler-ci Aug 28, 2018

E501 line too long (127 > 115 characters)

stickler-ci reviewed

View reviewed changes

corehq/ex-submodules/dimagi/utils/logging.py Outdated

@@ @@ -1,5 +1,6 @@ @@
               from __future__ import absolute_import
               from __future__ import unicode_literals
+              import six

stickler-ci Aug 29, 2018

F401 'six' imported but unused

corehq/util/view_utils.py Outdated

@@ @@ -10,7 +10,7 @@ @@
               from django.core.exceptions import PermissionDenied
               from django.http import Http404
               from django.urls import reverse as _reverse
-              from django.utils.encoding import smart_bytes
+              from django.utils.encoding import smart_bytes, smart_text

stickler-ci Aug 29, 2018

F401 'django.utils.encoding.smart_bytes' imported but unused

This was referenced Aug 31, 2018

fix "dictionary changed size during iteration" errors #21703

Merged

fix doctests in py3 #21704

Merged

replace assertItemsEqual #21705

Merged

move expectedFailure decorator so it works in py3 #21706

Merged

fix "UnboundLocalError: local variable 'spec_error' referenced before… #21707

Merged

pass bytes to hashlib.sha1 #21708

Merged

don't pass class type to types.MethodType #21729

Merged

Merged

handle json in both python2 and python3 #21731

Merged

use byte regex with bytestring #21732

Merged

stickler-ci reviewed

View reviewed changes

corehq/util/workbook_json/excel.py Outdated

@@ @@ -1,5 +1,7 @@ @@
               from __future__ import absolute_import
               from __future__ import unicode_literals
+              import io

stickler-ci Sep 4, 2018

F401 'io' imported but unused

stickler-ci reviewed

View reviewed changes

corehq/apps/locations/tests/test_dbaccessors.py Outdated

    
                      self.assertItemsEqual([u._id for u in users],

                                            [self.tyrion._id, self.daenerys._id])

                      self.assertEqual(set(u._id for u in users),

                                            {self.tyrion._id, self.daenerys._id})

stickler-ci Sep 7, 2018

E127 continuation line over-indented for visual indent

stickler-ci reviewed

View reviewed changes

corehq/apps/app_manager/xform.py Outdated

@@ @@ -805,7 +805,7 @@ def add_missing_instances(self, domain): @@
                       from corehq.apps.app_manager.suite_xml.post_process.instances import get_all_instances_referenced_in_xpaths
                       instance_declarations = self.get_instance_ids()
                       missing_unknown_instances = set()
-                      instances, unknown_instance_ids = get_all_instances_referenced_in_xpaths(domain, [self.render()])
+                      instances, unknown_instance_ids = get_all_instances_referenced_in_xpaths(domain, [self.render().decode('utf-8')])

stickler-ci Sep 8, 2018

E501 line too long (121 > 115 characters)

stickler-ci reviewed

View reviewed changes

corehq/apps/hqadmin/views/users.py Outdated

@@ @@ -260,9 +260,9 @@ def get_context_data(self, **kwargs): @@
                           else:
                               message = _('Unexpected restore response {}: {}. '
                                           'If you believe this is a bug please report an issue.').format(response.status_code,
-                                                                                                         response.content)
+                                                                                                         response.content.decode('utf-8'))

stickler-ci Sep 8, 2018

E501 line too long (124 > 115 characters)

stickler-ci reviewed

View reviewed changes

corehq/apps/callcenter/tests/test_indicators.py Outdated

+              # StaticIndicators = namedtuple('StaticIndicators', 'name, values, is_legacy, infix')
+              #
+              #
+              # def expected_standard_indicators(no_data=False, include_legacy=True, include_totals=True, case_types=None, limit_ranges=None):

stickler-ci Sep 8, 2018

E501 line too long (128 > 115 characters)

millerdev requested a review from esoergel as a code owner

June 9, 2019 18:58

Nick Pellegrino added 4 commits

June 9, 2019 15:13


          split


          try-finally-pass

1ba0fac


          close

1230c68


          get output in with

ce7c168

stickler-ci reviewed

View reviewed changes

corehq/util/tests/test_teeout.py Outdated

@@ @@ -17,8 +17,14 @@ def test_tee_output(): @@
                       print("testing...")
                       sys.stderr.write("fail.\n")
                       raise Error("stop")
-                  eq(fake.stdout.getvalue(), "testing...\n")
-                  eq(fake.stderr.getvalue(), "fail.\n")
+                      stdout_text = fail.stderr.getvalue()

stickler-ci Jun 9, 2019

F821 undefined name 'fail'

corehq/util/tests/test_teeout.py Outdated

-                  eq(fake.stdout.getvalue(), "testing...\n")
-                  eq(fake.stderr.getvalue(), "fail.\n")
+                      stdout_text = fail.stderr.getvalue()
+                      stderr_text = fail.stdout.getvalue()

stickler-ci Jun 9, 2019

F821 undefined name 'fail'

Nick Pellegrino added 22 commits

June 9, 2019 15:55

fix


          store output in finally

3776ae6


          Merge branch 'master' into dm/py3test


          try simple test case

840e02b


          cleanup

c977e61


          Merge branch 'master' into dm/py3test

c2a887b


          Merge branch 'master' into dm/py3test

2b71d9d


          Merge branch 'master' into dm/py3test

b963d71


          use py3

50d89e6


          fix csv342 imports in Python 3

138064c


          don't use pager for 'git diff' when testing requirements

953fe0c


          fix directory

38366ce


          specify requests

083f779


          Merge branch 'master' into dm/py3test

c4cabd6


          Merge remote-tracking branch 'origin/fr/cousins-sync-bug' into dm/py3…

97da2a1

…test


          use flag

77f42d4


          run tests

db44f5f


          revert requirements.in

3ef5c6c


          actually revert

8f4dc52


          update syntax

cef7b12


          Merge branch 'master' into dm/py3test

4cc0a7b


          Merge branch 'master' into dm/py3test

b5f2bd3

millerdev closed this

millerdev deleted the dm/py3test branch

May 13, 2020 20:16

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

kaapstorm kaapstorm left review comments

stickler-ci stickler-ci left review comments

nickpell Awaiting requested review from nickpell

calellowitz Awaiting requested review from calellowitz

emord Awaiting requested review from emord

orangejenny Awaiting requested review from orangejenny

proteusvacuum Awaiting requested review from proteusvacuum

snopoke Awaiting requested review from snopoke

esoergel Awaiting requested review from esoergel

Labels

Open for review: do not merge product/invisible