Skip to content

Commit 91aa62b

Browse files
authored
Merge pull request #15 from tableau/release/2.1.1
Release/2.1.1
2 parents e5f506d + 6afe993 commit 91aa62b

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Nullable>enable</Nullable>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
7-
<Version>2.1.0</Version>
7+
<Version>2.1.1</Version>
88
<Authors>Tableau Software, LLC</Authors>
99
<Company>Tableau Software, LLC</Company>
1010
<Copyright>Copyright (c) 2024, Tableau Software, LLC and its licensors</Copyright>

examples/Python.ExampleApplication/Python.ExampleApplication.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
def migrate():
1313
"""Performs a migration using Tableau Migration SDK."""
1414

15-
planBuilder = tableau_migration.MigrationPlanBuilder()
15+
plan_builder = tableau_migration.MigrationPlanBuilder()
1616
migration = tableau_migration.Migrator()
1717

1818
config = configparser.ConfigParser()
@@ -37,11 +37,11 @@ def migrate():
3737
# TODO: add filters, mappings, transformers, etc. here.
3838

3939
# Validate the migration plan.
40-
validation_result = planBuilder.validate()
40+
validation_result = plan_builder.validate()
4141

4242
# TODO: Handle errors if the validation fails here.
4343

44-
plan = planBuilder.build()
44+
plan = plan_builder.build()
4545

4646
# Run the migration.
4747
results = migration.execute(plan)
@@ -55,7 +55,7 @@ def migrate():
5555

5656
# Create a thread that will run the migration and start it.
5757
migration_thread = Thread(target = migrate)
58-
migration_thread.start();
58+
migration_thread.start()
5959
done = False
6060

6161
# Create a busy-wait loop to continue checking if Ctrl+C was pressed to cancel the migration.

src/Documentation/articles/troubleshooting/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Python
4949
for type in ServerToCloudMigrationPipeline.ContentTypes:
5050
content_type = type.ContentType
5151
_logger.LogInformation(f"## {content_type.Name} ##")
52-
for entry in result.Manifest.Entries.ForContentType(content_type):
52+
for entry in result.manifest.entries.ForContentType(content_type):
5353
_logger.LogInformation(f"{content_type.Name} {entry.Source.Location} Migration Status: {entry.Status}")
5454
if entry.Errors:
5555
_logger.LogError(f"## {content_type.Name} Errors detected! ##")

tests/Tableau.Migration.Tests/Unit/Engine/Manifest/MigrationManifestFactoryTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ public void CreatesInstancesWithoutInput()
9797
Assert.NotSame(manifest1, manifest2);
9898
}
9999

100-
//TODO (W-14313275): Previous manifest is not used
101-
//until it can be fully tested/made working.
102-
[Fact(Skip = "Previous manifest is not used until it can be fully tested/made working.")]
100+
[Fact]
103101
public void CopiesFromPreviousManifest()
104102
{
105103
var previousEntries = CreateMany<IMigrationManifestEntry>().ToImmutableArray();

tests/Tableau.Migration.Tests/Unit/FilePathTests.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// limitations under the License.
1515
//
1616

17-
using System;
1817
using System.Collections.Immutable;
1918
using System.IO;
2019
using Xunit;
@@ -26,10 +25,13 @@ public class FilePathTests
2625
public abstract class FilePathTest : AutoFixtureTestBase
2726
{
2827
protected string CreateFilePath(string? extension)
29-
=> Path.Combine($@"{Create<char>()}:\", CreateString(), CreateString(), CreateFileName(extension));
28+
=> Path.Combine(
29+
Path.GetTempPath(),
30+
Create<string>(),
31+
CreateFileName(extension));
3032

3133
protected string CreateFileName(string? extension)
32-
=> $"{CreateString()}{(!String.IsNullOrWhiteSpace(extension) ? $".{extension}" : String.Empty)}";
34+
=> $"{Create<string>()}{(!string.IsNullOrWhiteSpace(extension) ? $".{extension}" : string.Empty)}";
3335

3436
public class ZipExtensionsData : ValuesAttribute<string>
3537
{

tests/Tableau.Migration.Tests/Unit/StreamExtensionsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void False_when_stream_length_is_too_short()
140140
{
141141
var bytes = StreamExtensions.ZIP_LEAD_BYTES.Take(3);
142142

143-
var stream = CreateStream(3, bytes);
143+
var stream = CreateStream(0, bytes);
144144

145145
Assert.False(stream.IsZip());
146146
}

0 commit comments

Comments
 (0)