From 20f6f892e22c626ccb5dae7333914630428fa444 Mon Sep 17 00:00:00 2001 From: lambdaTW Date: Tue, 12 Nov 2019 15:05:47 +0800 Subject: [PATCH] Rearrange requirements files --- .circleci/config.yml | 12 ++++++------ requirements.txt | 8 +------- requirements/base.txt | 7 +++++++ deploy.txt => requirements/deploy.txt | 0 develop.txt => requirements/develop.txt | 0 5 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 requirements/base.txt rename deploy.txt => requirements/deploy.txt (100%) rename develop.txt => requirements/develop.txt (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f297d0..1d35e12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ jobs: # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "requirements.txt" }} + - v1-dependencies-{{ checksum "requirements/base.txt" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- @@ -37,7 +37,7 @@ jobs: - save_cache: paths: - ./venv - key: v1-dependencies-{{ checksum "requirements.txt" }} + key: v1-dependencies-{{ checksum "requirements/base.txt" }} # run tests! # this example uses Django's built-in test-runner @@ -64,7 +64,7 @@ jobs: - restore_cache: keys: - - v1-dependencies-{{ checksum "deploy.txt" }} + - v1-dependencies-{{ checksum "requirements/deploy.txt" }} - v1-dependencies- - run: @@ -72,12 +72,12 @@ jobs: command: | python3 -m venv venv . venv/bin/activate - pip install -r deploy.txt + pip install -r requirements/deploy.txt - save_cache: paths: - ./venv - key: v1-dependencies-{{ checksum "deploy.txt" }} + key: v1-dependencies-{{ checksum "requirements/deploy.txt" }} - run: name: run build wheel & delopy @@ -111,4 +111,4 @@ workflows: tags: only: /.*/ branches: - ignore: /.*/ \ No newline at end of file + ignore: /.*/ diff --git a/requirements.txt b/requirements.txt index 38250e3..5603c37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1 @@ -# Django -Django==2.2.6 -pytz==2019.2 -sqlparse==0.3.0 - -# RESTful framework -djangorestframework==3.10.2 +-r requirements/base.txt diff --git a/requirements/base.txt b/requirements/base.txt new file mode 100644 index 0000000..38250e3 --- /dev/null +++ b/requirements/base.txt @@ -0,0 +1,7 @@ +# Django +Django==2.2.6 +pytz==2019.2 +sqlparse==0.3.0 + +# RESTful framework +djangorestframework==3.10.2 diff --git a/deploy.txt b/requirements/deploy.txt similarity index 100% rename from deploy.txt rename to requirements/deploy.txt diff --git a/develop.txt b/requirements/develop.txt similarity index 100% rename from develop.txt rename to requirements/develop.txt