Skip to content

Commit

Permalink
refactor organization of cloudselect (#24)
Browse files Browse the repository at this point in the history
* refactor organization of cloudselect

I am not happy with the module name cloud_select or the cloud
module being nested under main, so this reorg should fix both
of those things before continuing work.

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
  • Loading branch information
vsoch authored Sep 10, 2023
1 parent 2afafe4 commit 86ab31a
Show file tree
Hide file tree
Showing 178 changed files with 12,860 additions and 17,362 deletions.
2 changes: 1 addition & 1 deletion .github/dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pre-commit
black
black==23.3.0
isort
flake8
pytest
10 changes: 8 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
formatting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup black linter
run: conda create --quiet --name black pytest
Expand All @@ -24,6 +24,12 @@ jobs:
pip install -r .github/dev-requirements.txt
pre-commit run --all-files
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup black linter
run: conda create --quiet --name black pytest
- name: Test
env:
ORAS_USER: ${{ github.actor }}
Expand All @@ -32,4 +38,4 @@ jobs:
export PATH="/usr/share/miniconda/bin:$PATH"
source activate black
pip install -e .[all]
pytest -xs cloud_select/tests/test*.py
pytest -xs cloudselect/tests/test*.py
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
- uses: actions/checkout@v3

- name: Install
run: conda create --quiet --name cloud_select twine
run: conda create --quiet --name cloudselect twine

- name: Install dependencies
run: |
export PATH="/usr/share/miniconda/bin:$PATH"
source activate cloud_select
source activate cloudselect
pip install -e .[all]
pip install setuptools wheel twine
- name: Build and publish
Expand All @@ -26,6 +26,6 @@ jobs:
TWINE_PASSWORD: ${{ secrets.PYPI_PASS }}
run: |
export PATH="/usr/share/miniconda/bin:$PATH"
source activate cloud_select
source activate cloudselect
python setup.py sdist bdist_wheel
twine upload dist/*
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
The versions coincide with releases on pip. Only major versions will be released as tags on Github.

## [0.0.x](https://github.com/converged-computing/cloud-select/tree/main) (0.0.x)
- rename module to cloudselect (0.0.19)
- bugfix for sorting by prices with select (0.0.18)
- selector class (with interactive or automated select) (0.0.17)
- support for `--efa` flag to find AWS instances that support it (0.0.16)
Expand Down
8 changes: 4 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
include README.md
include COPYRIGHT
recursive-include cloud_select *.png
recursive-include cloud_select *.sh
recursive-include cloud_select *
recursive-include cloudselect *.png
recursive-include cloudselect *.sh
recursive-include cloudselect *
recursive-include * *.png
prune env*
global-exclude .env
global-exclude *.py[co]
recursive-exclude .git *
global-exclude __pycache__
prune docs*
prune cloud_select/tests
prune cloudselect/tests
prune apigen
2 changes: 1 addition & 1 deletion apigen/apidoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# If the modules changed, the content of "source" should be backed up and
# new files generated (to update) by doing:
#
# sphinx-apidoc -o source/ ../cloud_select
# sphinx-apidoc -o source/ ../cloudselect

HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BASE=$(dirname $HERE)
Expand Down
2 changes: 1 addition & 1 deletion apigen/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Contents:
.. toctree::
:maxdepth: 3

source/cloud_select.rst
source/cloudselect.rst
changelog.md


Expand Down
37 changes: 0 additions & 37 deletions apigen/source/cloud_select.client.rst

This file was deleted.

37 changes: 0 additions & 37 deletions apigen/source/cloud_select.main.cloud.aws.rst

This file was deleted.

37 changes: 0 additions & 37 deletions apigen/source/cloud_select.main.cloud.google.rst

This file was deleted.

30 changes: 0 additions & 30 deletions apigen/source/cloud_select.main.cloud.rst

This file was deleted.

70 changes: 0 additions & 70 deletions apigen/source/cloud_select.main.rst

This file was deleted.

47 changes: 0 additions & 47 deletions apigen/source/cloud_select.rst

This file was deleted.

Loading

0 comments on commit 86ab31a

Please sign in to comment.