breaking: Remove deprecated contrib redirections

doc/workflows.rst

@@ -19,7 +19,7 @@ In practice, implementing Target subclasses is rarely needed.
 Luigi comes with a toolbox of several useful Targets.
 In particular, :class:`~luigi.file.LocalTarget` and :class:`~luigi.contrib.hdfs.target.HdfsTarget`,
 but there is also support for other file systems:
-:class:`luigi.s3.S3Target`,
+:class:`luigi.contrib.s3.S3Target`,
 :class:`luigi.contrib.ssh.RemoteTarget`,
 :class:`luigi.contrib.ftp.RemoteTarget`,
 :class:`luigi.contrib.mysqldb.MySqlTarget`,

examples/pyspark_wc.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 import luigi
-from luigi.s3 import S3Target
+from luigi.contrib.s3 import S3Target
 from luigi.contrib.spark import SparkSubmitTask, PySparkTask
 
 

examples/top_artists.py

@@ -246,12 +246,13 @@ def _input_iterator(self):
 
 class ArtistToplistToDatabase(luigi.contrib.postgres.CopyToTable):
     """
-    This task runs a :py:class:`luigi.postgres.CopyToTable` task
+    This task runs a :py:class:`luigi.contrib.postgres.CopyToTable` task
     over the target data returned by :py:meth:`~/.Top10Artists.output` and
     writes the result into its :py:meth:`~.ArtistToplistToDatabase.output` target which,
-    by default, is :py:class:`luigi.postgres.PostgresTarget` (a table in PostgreSQL).
+    by default, is :py:class:`luigi.contrib.postgres.PostgresTarget` (a table in PostgreSQL).
 
-    This class uses :py:meth:`luigi.postgres.CopyToTable.run` and :py:meth:`luigi.postgres.CopyToTable.output`.
+    This class uses :py:meth:`luigi.contrib.postgres.CopyToTable.run`
+    and :py:meth:`luigi.contrib.postgres.CopyToTable.output`.
     """
 
     date_interval = luigi.DateIntervalParameter()

luigi/contrib/opener.py

@@ -33,7 +33,7 @@
 
 from luigi.file import LocalTarget
 from luigi.mock import MockTarget
-from luigi.s3 import S3Target
+from luigi.contrib.s3 import S3Target
 from luigi.target import FileSystemException
 from six.moves.urllib.parse import urlsplit, parse_qs
 

luigi/contrib/redshift.py

@@ -22,9 +22,9 @@
 import os
 
 import luigi
-from luigi import postgres
+from luigi.contrib import postgres
 from luigi.contrib import rdbms
-from luigi.s3 import S3PathTask, S3Target
+from luigi.contrib.s3 import S3PathTask, S3Target
 
 logger = logging.getLogger('luigi-interface')
 

luigi/contrib/s3.py

@@ -412,7 +412,7 @@ def __copy_multipart(self, pool, src_bucket, src_key, dst_bucket, dst_key, part_
         """
         Copy a single S3 object to another S3 object, falling back to multipart copy where necessary
 
-        NOTE: This is a private method and should only be called from within the `luigi.s3.copy` method
+        NOTE: This is a private method and should only be called from within the `s3.copy` method
 
         :param pool: The threadpool to put the s3 copy processes onto
         :param src_bucket: source bucket name

luigi/tools/deps.py

@@ -40,8 +40,8 @@
 from __future__ import print_function
 import luigi.interface
 from luigi.contrib.ssh import RemoteTarget
-from luigi.postgres import PostgresTarget
-from luigi.s3 import S3Target
+from luigi.contrib.postgres import PostgresTarget
+from luigi.contrib.s3 import S3Target
 from luigi.target import FileSystemTarget
 from luigi.task import flatten
 from luigi import parameter

test/contrib/opener_test.py

@@ -89,7 +89,7 @@ def test_local_tmp_target(self, lt_del_patch, lt_init_patch):
         OpenerTarget(local_file)
         lt_init_patch.assert_called_with(self.local_file, is_tmp=True)
 
-    @mock.patch('luigi.s3.S3Target.__init__')
+    @mock.patch('luigi.contrib.s3.S3Target.__init__')
     def test_s3_parse(self, s3_init_patch):
         '''Verify basic s3 target url
 
@@ -100,7 +100,7 @@ def test_s3_parse(self, s3_init_patch):
         OpenerTarget(local_file)
         s3_init_patch.assert_called_with("s3://zefr/foo/bar.txt")
 
-    @mock.patch('luigi.s3.S3Target.__init__')
+    @mock.patch('luigi.contrib.s3.S3Target.__init__')
     def test_s3_parse_param(self, s3_init_patch):
         '''Verify s3 target url with params
 

test/contrib/postgres_test.py

@@ -14,7 +14,7 @@
 
 import datetime
 import luigi
-import luigi.postgres
+import luigi.contrib.postgres
 from luigi.tools.range import RangeDaily
 from helpers import unittest
 import mock
@@ -44,7 +44,7 @@ def fetchone(self):
         return self.fetchone_result
 
 
-class DummyPostgresImporter(luigi.postgres.CopyToTable):
+class DummyPostgresImporter(luigi.contrib.postgres.CopyToTable):
     date = luigi.DateParameter()
 
     host = 'dummy_host'
@@ -83,7 +83,7 @@ def test_bulk_complete(self, mock_connect):
         self.assertFalse(task.complete())
 
 
-class DummyPostgresQuery(luigi.postgres.PostgresQuery):
+class DummyPostgresQuery(luigi.contrib.postgres.PostgresQuery):
     date = luigi.DateParameter()
 
     host = 'dummy_host'

test/contrib/postgres_with_server_test.py

@@ -21,7 +21,7 @@
 
 import luigi
 import luigi.notifications
-from luigi import postgres
+from luigi.contrib import postgres
 
 """
 Typical use cases that should be tested:

test/contrib/s3_test.py

@@ -29,7 +29,7 @@
 from moto import mock_sts
 
 from luigi import configuration
-from luigi.s3 import FileNotFoundException, InvalidDeleteException, S3Client, S3Target
+from luigi.contrib.s3 import FileNotFoundException, InvalidDeleteException, S3Client, S3Target
 from luigi.target import MissingParentDirectory
 
 if (3, 4, 0) <= sys.version_info[:3] < (3, 4, 3):

test/redshift_test.py

@@ -26,7 +26,7 @@
 from luigi.contrib import redshift
 from moto import mock_s3
 from boto.s3.key import Key
-from luigi.s3 import S3Client
+from luigi.contrib.s3 import S3Client
 
 
 if (3, 4, 0) <= sys.version_info[:3] < (3, 4, 3):