Skip to content
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.

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

Remove poetry integration tests for build-info #2323

Merged
merged 5 commits into from
Nov 26, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/pythonTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
suite: [ pip, pipenv, poetry ]
suite: [ pip, pipenv ]
os: [ ubuntu, windows, macos ]
runs-on: ${{ matrix.os }}-latest
steps:
Expand All @@ -35,9 +35,6 @@ jobs:
- name: Setup Pipenv
if: ${{ matrix.suite == 'pipenv' }}
run: python -m pip install pipenv
- name: Setup Poetry
if: ${{ matrix.suite == 'poetry' }}
run: python -m pip install poetry
- name: Checkout code
uses: actions/checkout@v3
with:
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ The available test types are:
| `-test.go` | Go tests |
| `-test.pip` | Pip tests |
| `-test.pipenv` | Pipenv tests |
| `-test.poetry` | Poetry tests |
| `-test.nuget` | Nuget tests |
| `-test.plugins` | Plugins tests |
| `-test.distribution` | Distribution tests |
Expand Down
4 changes: 2 additions & 2 deletions main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func setupIntegrationTests() {
if (*tests.TestArtifactory && !*tests.TestArtifactoryProxy) || *tests.TestArtifactoryProject {
InitArtifactoryTests()
}
if *tests.TestNpm || *tests.TestGradle || *tests.TestMaven || *tests.TestGo || *tests.TestNuget || *tests.TestPip || *tests.TestPipenv || *tests.TestPoetry {
if *tests.TestNpm || *tests.TestGradle || *tests.TestMaven || *tests.TestGo || *tests.TestNuget || *tests.TestPip || *tests.TestPipenv {
InitBuildToolsTests()
}
if *tests.TestDocker || *tests.TestPodman || *tests.TestDockerScan {
Expand Down Expand Up @@ -85,7 +85,7 @@ func tearDownIntegrationTests() {
if (*tests.TestArtifactory && !*tests.TestArtifactoryProxy) || *tests.TestArtifactoryProject {
CleanArtifactoryTests()
}
if *tests.TestNpm || *tests.TestGradle || *tests.TestMaven || *tests.TestGo || *tests.TestNuget || *tests.TestPip || *tests.TestPipenv || *tests.TestPoetry || *tests.TestDocker || *tests.TestPodman || *tests.TestDockerScan {
if *tests.TestNpm || *tests.TestGradle || *tests.TestMaven || *tests.TestGo || *tests.TestNuget || *tests.TestPip || *tests.TestPipenv || *tests.TestDocker || *tests.TestPodman || *tests.TestDockerScan {
CleanBuildToolsTests()
}
if *tests.TestDistribution {
Expand Down
129 changes: 0 additions & 129 deletions poetry_test.go

This file was deleted.

2 changes: 0 additions & 2 deletions utils/tests/consts.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,6 @@ var (
PypiVirtualRepo = "cli-pypi-virtual"
attiasas marked this conversation as resolved.
Show resolved Hide resolved
PipenvRemoteRepo = "cli-pipenv-pypi-remote"
PipenvVirtualRepo = "cli-pipenv-pypi-virtual"
PoetryRemoteRepo = "cli-poetry-pypi-remote"
PoetryVirtualRepo = "cli-poetry-pypi-virtual"
DockerLocalRepo = "cli-docker-local"
DockerLocalPromoteRepo = "cli-docker-local-promote"
DockerRemoteRepo = "cli-docker-remote"
Expand Down
11 changes: 0 additions & 11 deletions utils/tests/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ var (
TestNuget *bool
TestPip *bool
TestPipenv *bool
TestPoetry *bool
TestPlugins *bool
TestXray *bool
TestAccess *bool
Expand Down Expand Up @@ -101,7 +100,6 @@ func init() {
TestNuget = flag.Bool("test.nuget", false, "Test Nuget")
TestPip = flag.Bool("test.pip", false, "Test Pip")
TestPipenv = flag.Bool("test.pipenv", false, "Test Pipenv")
TestPoetry = flag.Bool("test.poetry", false, "Test Poetry")
TestPlugins = flag.Bool("test.plugins", false, "Test Plugins")
TestXray = flag.Bool("test.xray", false, "Test Xray")
TestAccess = flag.Bool("test.access", false, "Test Access")
Expand Down Expand Up @@ -341,8 +339,6 @@ var reposConfigMap = map[*string]string{
&PypiVirtualRepo: PypiVirtualRepositoryConfig,
&PipenvRemoteRepo: PipenvRemoteRepositoryConfig,
&PipenvVirtualRepo: PipenvVirtualRepositoryConfig,
&PoetryRemoteRepo: PoetryRemoteRepositoryConfig,
&PoetryVirtualRepo: PoetryVirtualRepositoryConfig,
&RtDebianRepo: DebianTestRepositoryConfig,
&RtLfsRepo: GitLfsTestRepositoryConfig,
&RtRepo1: Repo1RepositoryConfig,
Expand Down Expand Up @@ -400,7 +396,6 @@ func GetNonVirtualRepositories() map[*string]string {
TestNuget: {&NugetRemoteRepo},
TestPip: {&PypiRemoteRepo},
TestPipenv: {&PipenvRemoteRepo},
TestPoetry: {&PoetryRemoteRepo},
TestPlugins: {&RtRepo1},
TestXray: {},
TestAccess: {&RtRepo1},
Expand All @@ -425,7 +420,6 @@ func GetVirtualRepositories() map[*string]string {
TestNuget: {},
TestPip: {&PypiVirtualRepo},
TestPipenv: {&PipenvVirtualRepo},
TestPoetry: {&PoetryVirtualRepo},
TestPlugins: {},
TestXray: {},
TestAccess: {},
Expand Down Expand Up @@ -461,7 +455,6 @@ func GetBuildNames() []string {
TestNuget: {&NuGetBuildName},
TestPip: {&PipBuildName},
TestPipenv: {&PipenvBuildName},
TestPoetry: {&PoetryBuildName},
TestPlugins: {},
TestXray: {},
TestAccess: {},
Expand Down Expand Up @@ -509,8 +502,6 @@ func getSubstitutionMap() map[string]string {
"${PYPI_VIRTUAL_REPO}": PypiVirtualRepo,
"${PIPENV_REMOTE_REPO}": PipenvRemoteRepo,
"${PIPENV_VIRTUAL_REPO}": PipenvVirtualRepo,
"${POETRY_REMOTE_REPO}": PoetryRemoteRepo,
"${POETRY_VIRTUAL_REPO}": PoetryVirtualRepo,
"${BUILD_NAME1}": RtBuildName1,
"${BUILD_NAME2}": RtBuildName2,
"${BUNDLE_NAME}": BundleName,
Expand Down Expand Up @@ -567,8 +558,6 @@ func AddTimestampToGlobalVars() {
PypiVirtualRepo += uniqueSuffix
PipenvRemoteRepo += uniqueSuffix
PipenvVirtualRepo += uniqueSuffix
PoetryRemoteRepo += uniqueSuffix
PoetryVirtualRepo += uniqueSuffix
RtDebianRepo += uniqueSuffix
RtLfsRepo += uniqueSuffix
RtRepo1 += uniqueSuffix
Expand Down
Loading