diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 87fdd57..56826c3 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -1,17 +1,18 @@ name: Publish to PyPi -on: workflow_dispatch +on: + workflow_dispatch: jobs: build-and-publish: name: Build python package and publish to PyPi runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - name: Set up Python 3.9 - uses: actions/setup-python@v2 + - uses: actions/checkout@v6 + - name: Set up Python 3.13 + uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.13 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index 753b731..3726894 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -1,17 +1,21 @@ name: Publish to Test PyPi -on: workflow_dispatch +on: + workflow_dispatch: + release: + types: + - published jobs: build-and-publish: name: Build python package and publish to Test PyPi runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - name: Set up Python 3.9 - uses: actions/setup-python@v2 + - uses: actions/checkout@v6 + - name: Set up Python 3.13 + uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.13 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/run_tests_CI.yml b/.github/workflows/run_tests_CI.yml index e707854..dc4266f 100644 --- a/.github/workflows/run_tests_CI.yml +++ b/.github/workflows/run_tests_CI.yml @@ -11,12 +11,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.9 - uses: actions/setup-python@v2 + - uses: actions/checkout@v6 + - name: Set up Python 3.13 + uses: actions/setup-python@v5 with: - python-version: 3.9 - - uses: actions/cache@v3 + python-version: 3.13 + - uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }} diff --git a/Dockerfile.dev b/Dockerfile.dev index eeeb122..ce23d6c 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM python:3.9-alpine +FROM python:3-alpine WORKDIR /usr/src/panoptes-cli diff --git a/Dockerfile.dev2 b/Dockerfile.dev2 deleted file mode 100644 index 010aa7d..0000000 --- a/Dockerfile.dev2 +++ /dev/null @@ -1,12 +0,0 @@ -FROM python:2-alpine - -WORKDIR /usr/src/panoptes-cli - -RUN apk --no-cache add git libmagic -RUN pip install git+https://github.com/zooniverse/panoptes-python-client.git - -COPY . . - -RUN pip install . - -CMD [ "panoptes" ] diff --git a/Dockerfile.stable2 b/Dockerfile.stable2 deleted file mode 100644 index 46f2951..0000000 --- a/Dockerfile.stable2 +++ /dev/null @@ -1,6 +0,0 @@ -FROM python:2.7-alpine - -RUN apk add --no-cache libmagic -RUN pip install panoptescli - -CMD [ "panoptes" ] diff --git a/docker-compose.yml b/docker-compose.yml index 68f4545..ec9c082 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '2' - services: dev: build: @@ -29,32 +27,3 @@ services: - ${HOME}/.panoptes/:/root/.panoptes/ - ${HOME}:${HOME} working_dir: ${PWD} - - dev2: - build: - context: ./ - dockerfile: Dockerfile.dev2 - volumes: - - ${HOME}/.panoptes/:/root/.panoptes/ - - ${HOME}:${HOME} - working_dir: ${PWD} - - debug2: - build: - context: ./ - dockerfile: Dockerfile.dev2 - volumes: - - ${HOME}/.panoptes/:/root/.panoptes/ - - ${HOME}:${HOME} - environment: - - PANOPTES_DEBUG=true - working_dir: ${PWD} - - stable2: - build: - context: ./ - dockerfile: Dockerfile.stable2 - volumes: - - ${HOME}/.panoptes/:/root/.panoptes/ - - ${HOME}:${HOME} - working_dir: ${PWD} diff --git a/setup.py b/setup.py index 1353273..8f54c8e 100644 --- a/setup.py +++ b/setup.py @@ -17,10 +17,10 @@ packages=find_packages(), include_package_data=True, install_requires=[ - 'Click>=6.7,<8.2', - 'PyYAML>=5.1,<6.1', + 'Click>=6.7', + 'PyYAML>=5.1', 'panoptes-client>=1.7,<2.0', - 'humanize>=0.5.1,<4.8', + 'humanize>=0.5.1', 'pathvalidate>=0.29.0,<2.6', ], entry_points='''