Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
11 changes: 6 additions & 5 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/run_tests_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9-alpine
FROM python:3-alpine

WORKDIR /usr/src/panoptes-cli

Expand Down
12 changes: 0 additions & 12 deletions Dockerfile.dev2

This file was deleted.

6 changes: 0 additions & 6 deletions Dockerfile.stable2

This file was deleted.

31 changes: 0 additions & 31 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2'

services:
dev:
build:
Expand Down Expand Up @@ -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}
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='''
Expand Down