diff --git a/.github/dev-requirements.txt b/.github/dev-requirements.txt index 29ea36c..a872fd6 100644 --- a/.github/dev-requirements.txt +++ b/.github/dev-requirements.txt @@ -1,5 +1,5 @@ pre-commit -black==23.3.0 +black==24.1.0 isort flake8 mypy==0.961 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fe2184f..10178f7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,16 +8,17 @@ jobs: generate-docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: gh-pages - - name: Create conda environment - run: conda create --quiet -c conda-forge --name oraspy + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.11 - name: Install Oras and Dependencies run: | - export PATH="/usr/share/miniconda/bin:$PATH" root=$PWD source activate oraspy cd /tmp diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 4de5ef0..ebfbc89 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -6,18 +6,21 @@ jobs: formatting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check Spelling uses: crate-ci/typos@7ad296c72fa8265059cc03d1eda562fbdfcd6df2 # v1.9.0 with: files: ./docs ./README.md - - name: Setup Environment - run: conda create --quiet --name oras pre-commit + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.11 - name: Lint Oras Python run: | - export PATH="/usr/share/miniconda/bin:$PATH" - source activate oras + python --version + python3 -m pip install pre-commit + python3 -m pip install black make develop make lint @@ -30,16 +33,15 @@ jobs: - 5000:5000 steps: - uses: actions/checkout@v3 - - name: Setup Environment - run: conda create --quiet --name oras requests + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.11 - name: Test Oras Python env: registry_host: localhost registry_port: ${{ job.services.registry.ports[5000] }} REGISTRY_STORAGE_DELETE_ENABLED: "true" run: | - export PATH="/usr/share/miniconda/bin:$PATH" - source activate oras - pip install --upgrade pip setuptools make install make test diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5607f41..63b7e4d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,15 +10,14 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - - name: Install - run: conda create --quiet --name oras twine + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.11 - name: Install dependencies run: | - export PATH="/usr/share/miniconda/bin:$PATH" - source activate oras pip install -e . pip install setuptools wheel twine - name: Build and publish @@ -26,7 +25,5 @@ jobs: TWINE_USERNAME: ${{ secrets.PYPI_USER }} TWINE_PASSWORD: ${{ secrets.PYPI_PASS }} run: | - export PATH="/usr/share/miniconda/bin:$PATH" - source activate oras python setup.py sdist bdist_wheel twine upload dist/*