From 8aa686caec914219ffc215ec6de3252c4d90dceb Mon Sep 17 00:00:00 2001 From: Croydon Date: Fri, 10 May 2024 09:09:31 +0200 Subject: [PATCH] Modularize --- .github/workflows/ci.yml | 1 + .github/workflows/generate.yml | 1 + bincrafters_conan_remote/__init__.py | 0 generate.py => bincrafters_conan_remote/generate.py | 0 main.py => bincrafters_conan_remote/main.py | 0 .../remote_repo_meta_files}/.gitignore | 0 .../remote_repo_meta_files}/readme.md | 0 .../requirements.txt | 0 .../requirements_dev.txt | 0 setup.py | 13 ++++++------- 10 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 bincrafters_conan_remote/__init__.py rename generate.py => bincrafters_conan_remote/generate.py (100%) rename main.py => bincrafters_conan_remote/main.py (100%) rename {remote_repo_meta_files => bincrafters_conan_remote/remote_repo_meta_files}/.gitignore (100%) rename {remote_repo_meta_files => bincrafters_conan_remote/remote_repo_meta_files}/readme.md (100%) rename requirements.txt => bincrafters_conan_remote/requirements.txt (100%) rename requirements_dev.txt => bincrafters_conan_remote/requirements_dev.txt (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a489f0a..013192e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,7 @@ jobs: with: python-version: "3.12" - run: | + cd bincrafter_conan_remote/ pip install -r requirements.txt pip install -r requirements_dev.txt - name: Start Local Server diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index ae4e45c..66c5c80 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -35,6 +35,7 @@ jobs: with: python-version: "3.12" - run: | + cd bincrafter_conan_remote/ pip install -r requirements.txt pip install -r requirements_dev.txt - name: Configure Conan diff --git a/bincrafters_conan_remote/__init__.py b/bincrafters_conan_remote/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/generate.py b/bincrafters_conan_remote/generate.py similarity index 100% rename from generate.py rename to bincrafters_conan_remote/generate.py diff --git a/main.py b/bincrafters_conan_remote/main.py similarity index 100% rename from main.py rename to bincrafters_conan_remote/main.py diff --git a/remote_repo_meta_files/.gitignore b/bincrafters_conan_remote/remote_repo_meta_files/.gitignore similarity index 100% rename from remote_repo_meta_files/.gitignore rename to bincrafters_conan_remote/remote_repo_meta_files/.gitignore diff --git a/remote_repo_meta_files/readme.md b/bincrafters_conan_remote/remote_repo_meta_files/readme.md similarity index 100% rename from remote_repo_meta_files/readme.md rename to bincrafters_conan_remote/remote_repo_meta_files/readme.md diff --git a/requirements.txt b/bincrafters_conan_remote/requirements.txt similarity index 100% rename from requirements.txt rename to bincrafters_conan_remote/requirements.txt diff --git a/requirements_dev.txt b/bincrafters_conan_remote/requirements_dev.txt similarity index 100% rename from requirements_dev.txt rename to bincrafters_conan_remote/requirements_dev.txt diff --git a/setup.py b/setup.py index 61898a0..0b9b6e3 100644 --- a/setup.py +++ b/setup.py @@ -25,8 +25,8 @@ def get_requires(filename): return requirements -project_requirements = get_requires("requirements.txt") -# dev_requirements = get_requires("requirements_dev.txt") +project_requirements = get_requires(os.path.join("bincrafters_conan_remote", "requirements.txt")) +# dev_requirements = get_requires(os.path.join("bincrafters_conan_remote", "requirements_dev.txt")) setup( @@ -97,11 +97,10 @@ def get_requires(filename): #}, # If there are data files included in your packages that need to be - # installed, specify them here. If using Python 2.6 or less, then these - # have to be included in MANIFEST.in as well. - # package_data={ - # 'conans': ['*.txt'], - #}, + # installed, specify them here. + package_data={ + "bincrafters_conan_remote": ["remote_repo_meta_files/*", "remote_repo_meta_files/.gitignore"], + }, # Although 'package_data' is the preferred approach, in some case you may # need to place data files outside of your packages. See: