Update GHA python tests (#435)

jfrog · Nov 7, 2023 · 8aab3ee · 8aab3ee
1 parent 065c8b1
commit 8aab3ee
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 13 deletions.
diff --git a/src/test/resources/python/regex/setupAllKindOfDepsVariations.py b/src/test/resources/python/regex/setupAllKindOfDepsVariations.py
@@ -7,7 +7,6 @@
         'PyYAML',
         'fire==0.1.3',
 
-        'regex==2017.4.5',
             'matplotlib>=2.2.0,<2.4.0',
         'newrelic==2.0.*',
         'jupyter~=1.1.1',

diff --git a/src/test/resources/python/regex/setupWithNoName.py b/src/test/resources/python/regex/setupWithNoName.py
@@ -6,7 +6,6 @@
         'PyYAML',
         'fire==0.1.3',
 
-        'regex==2017.4.5',
             'matplotlib>=2.2.0,<2.4.0',
         'newrelic==2.0.*',
         'jupyter~=1.1.1',

diff --git a/src/test/resources/python/requirements/requirements.txt b/src/test/resources/python/requirements/requirements.txt
@@ -1,3 +1,2 @@
 fire==0.1.3
-regex==2017.4.5
 newrelic==2.0.0.1
diff --git a/src/test/resources/python/setup/setup.py b/src/test/resources/python/setup/setup.py
@@ -3,5 +3,5 @@
 setuptools.setup(
     name="snake",
     version="2.2.2",
-    install_requires=['fire==0.1.3', 'regex==2017.4.5', 'newrelic==2.0.0.1']
+    install_requires=['fire==0.1.3', 'newrelic==2.0.0.1']
 )
diff --git a/src/test/resources/python/setupAndRequirements/requirements.txt b/src/test/resources/python/setupAndRequirements/requirements.txt
@@ -1,3 +1,2 @@
 fire==0.1.3
-regex==2017.4.5
 newrelic==2.0.0.1
diff --git a/src/test/resources/python/updateToFixedVersion/requirements.txt b/src/test/resources/python/updateToFixedVersion/requirements.txt
@@ -1,3 +1,2 @@
 fire==0.1.3
-regex==2017.4.5
 newrelic==2.0.0.1
diff --git a/src/test/tests/pypiUtils.test.ts b/src/test/tests/pypiUtils.test.ts
@@ -64,12 +64,11 @@ describe('Pypi Utils Tests', async () => {
         dependencyToVersion = PypiUtils.getSetupPyDirectDependencies(path.join(tmpDir.fsPath, 'regex', 'setupAllKindOfDepsVariations.py'));
         assert.equal(dependencyToVersion.get('pyyaml'), '');
         assert.equal(dependencyToVersion.get('fire'), '==0.1.3');
-        assert.equal(dependencyToVersion.get('regex'), '==2017.4.5');
         assert.equal(dependencyToVersion.get('matplotlib'), '>=2.2.0,<2.4.0');
         assert.equal(dependencyToVersion.get('newrelic'), '==2.0.*');
         assert.equal(dependencyToVersion.get('jupyter'), '~=1.1.1');
         assert.equal(dependencyToVersion.get('numpy'), '>=1.14.5');
-        assert.equal(dependencyToVersion.size, 7);
+        assert.equal(dependencyToVersion.size, 6);
     });
 
     it('Match setup.py project name with regex', () => {
@@ -145,13 +144,13 @@ describe('Pypi Utils Tests', async () => {
             new GeneralInfo('newrelic', '2.0.0.1', [], '', PackageType.Unknown)
         );
         let dependencyPos: vscode.Range[] = PypiUtils.getDependencyPosition(textDocument, dependenciesTreeNode.generalInfo.artifactId);
-        assert.deepEqual(dependencyPos[0].start, new vscode.Position(2, 0));
+        assert.deepEqual(dependencyPos[0].start, new vscode.Position(1, 0));
 
         // Test 'resources/python/setupAndRequirements'
         requirements = vscode.Uri.file(path.join(tmpDir.fsPath, 'setupAndRequirements', 'requirements.txt'));
         textDocument = await vscode.workspace.openTextDocument(requirements);
         dependencyPos = PypiUtils.getDependencyPosition(textDocument, dependenciesTreeNode.generalInfo.artifactId);
-        assert.deepEqual(dependencyPos[0].start, new vscode.Position(2, 0));
+        assert.deepEqual(dependencyPos[0].start, new vscode.Position(1, 0));
     });
 
     /**
@@ -180,7 +179,7 @@ describe('Pypi Utils Tests', async () => {
         // Test 'resources/python/requirements'
         let node: PypiTreeNode | undefined = parent.children[0] as PypiTreeNode;
         assert.deepEqual(node?.label, 'requirements.txt');
-        assert.deepEqual(node?.children.length, 3);
+        assert.deepEqual(node?.children.length, 2);
         checkFireDependency(node);
 
         // Test 'resources/python/setup'
@@ -199,7 +198,7 @@ describe('Pypi Utils Tests', async () => {
         );
         node = parent.children[1] as PypiTreeNode;
         assert.deepEqual(node.label, 'setup.py');
-        assert.deepEqual(node.children.length, 3);
+        assert.deepEqual(node.children.length, 2);
         checkFireDependency(node);
 
         // Test 'resources/python/setupAndRequirements'
@@ -229,7 +228,7 @@ describe('Pypi Utils Tests', async () => {
             assert.fail;
             return;
         }
-        assert.deepEqual(node.children.length, 3);
+        assert.deepEqual(node.children.length, 2);
         checkFireDependency(node);
     });